diff --git a/.github/workflows/intellij-build.yml b/.github/workflows/intellij-build.yml index 309568b..6a68519 100644 --- a/.github/workflows/intellij-build.yml +++ b/.github/workflows/intellij-build.yml @@ -55,9 +55,7 @@ jobs: # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-home-cache-cleanup: true + uses: gradle/actions/setup-gradle@v4 # Set environment variables - name: Export Properties @@ -119,9 +117,7 @@ jobs: # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-home-cache-cleanup: true + uses: gradle/actions/setup-gradle@v4 # Run tests - name: Run Tests @@ -163,6 +159,9 @@ jobs: # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit + fetch-depth: 0 # a full history is required for pull request analysis # Set up Java environment for the next steps - name: Setup Java @@ -204,9 +203,7 @@ jobs: # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-home-cache-cleanup: true + uses: gradle/actions/setup-gradle@v4 # Cache Plugin Verifier IDEs - name: Setup Plugin Verifier IDEs Cache diff --git a/.github/workflows/intellij-release.yml b/.github/workflows/intellij-release.yml index 439204d..4d7fb4b 100644 --- a/.github/workflows/intellij-release.yml +++ b/.github/workflows/intellij-release.yml @@ -34,9 +34,7 @@ jobs: # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-home-cache-cleanup: true + uses: gradle/actions/setup-gradle@v4 # Set environment variables - name: Export Properties diff --git a/.github/workflows/intellij-run-ui-tests.yml b/.github/workflows/intellij-run-ui-tests.yml index 6b60acd..c901413 100644 --- a/.github/workflows/intellij-run-ui-tests.yml +++ b/.github/workflows/intellij-run-ui-tests.yml @@ -44,9 +44,7 @@ jobs: # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-home-cache-cleanup: true + uses: gradle/actions/setup-gradle@v4 # Run IDEA prepared for UI testing - name: Run IDE diff --git a/intellij/gradle.properties b/intellij/gradle.properties index c1f2bdc..6230192 100644 --- a/intellij/gradle.properties +++ b/intellij/gradle.properties @@ -4,15 +4,15 @@ pluginGroup = org.basedsoft.plugins.basedtyping pluginName = basedtyping pluginRepositoryUrl = https://github.com/KotlinIsland/basedtyping # SemVer format -> https://semver.org -pluginVersion = 0.1.4 +pluginVersion = 0.1.4+243 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html pluginSinceBuild = 233 -pluginUntilBuild = 242.* +pluginUntilBuild = 243.* # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = PC -platformVersion = 2023.3.6 +platformVersion = 2023.3.7 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP @@ -21,7 +21,7 @@ platformPlugins = platformBundledPlugins = PythonCore # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 8.9 +gradleVersion = 8.10.2 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib kotlin.stdlib.default.dependency = false diff --git a/intellij/gradle/libs.versions.toml b/intellij/gradle/libs.versions.toml index f503e98..8ae7fb1 100644 --- a/intellij/gradle/libs.versions.toml +++ b/intellij/gradle/libs.versions.toml @@ -4,7 +4,7 @@ junit = "4.13.2" # plugins changelog = "2.2.1" -intelliJPlatform = "2.0.1" +intelliJPlatform = "2.1.0" kotlin = "1.9.25" kover = "0.8.3" diff --git a/intellij/gradle/wrapper/gradle-wrapper.jar b/intellij/gradle/wrapper/gradle-wrapper.jar index 2c35211..a4b76b9 100644 Binary files a/intellij/gradle/wrapper/gradle-wrapper.jar and b/intellij/gradle/wrapper/gradle-wrapper.jar differ diff --git a/intellij/gradle/wrapper/gradle-wrapper.properties b/intellij/gradle/wrapper/gradle-wrapper.properties index 09523c0..df97d72 100644 --- a/intellij/gradle/wrapper/gradle-wrapper.properties +++ b/intellij/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/intellij/src/test/java/com/jetbrains/python/fixtures/PyTestCase.java b/intellij/src/test/java/com/jetbrains/python/fixtures/PyTestCase.java index 75afbf9..65590ab 100644 --- a/intellij/src/test/java/com/jetbrains/python/fixtures/PyTestCase.java +++ b/intellij/src/test/java/com/jetbrains/python/fixtures/PyTestCase.java @@ -431,11 +431,6 @@ protected void refactorUsingHandler(@NotNull final RefactoringActionHandler hand handler.invoke(myFixture.getProject(), editor, myFixture.getFile(), ((EditorEx)editor).getDataContext()); } - public static String getHelpersPath() { - return new File(PythonHelpersLocator.getPythonCommunityPath(), "helpers").getPath(); - } - - /** * Compares sets with string sorting them and displaying one-per-line to make comparision easier *