upgrade gradle to 7.5.1 (#131)

shalom938 · web-flow · commit 9800ffcbc595 · 2022-08-10T13:42:29.000+03:00
Signed-off-by: shalom &lt;shalom938@gmail.com&gt;
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -72,7 +72,7 @@ jobs:
 
       # Run tests
       - name: Run Tests
-        run: ./gradlew test
+        run: ./gradlew build
 
       # Collect Tests Result of failed tests
       ##todo: add other modules test reports
diff --git a/.github/workflows/gradle-ci-pr.yml b/.github/workflows/gradle-ci-pr.yml
@@ -37,7 +37,7 @@ jobs:
         uses: gradle/gradle-build-action@v2.2.2
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/main' }}
-          arguments: buildPlugin runPluginVerifier --no-daemon
+          arguments: build buildPlugin runPluginVerifier --no-daemon
 
       - name: Prepare Plugin Artifact
         id: artifact
diff --git a/.github/workflows/gradle-ci.yml b/.github/workflows/gradle-ci.yml
@@ -41,7 +41,7 @@ jobs:
           #            caches/**/riderRD-*/**
           #            caches/**/ideaIC-*/**
           #            caches/**/pycharmPC-*/**
-          arguments: buildPlugin --no-daemon
+          arguments: build buildPlugin --no-daemon
 
       - name: Prepare Plugin Artifact
         id: artifact
diff --git a/.github/workflows/multi-java-build.yml b/.github/workflows/multi-java-build.yml
@@ -42,7 +42,7 @@ jobs:
         uses: gradle/gradle-build-action@v2.2.2
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/main' }}
-          arguments: buildPlugin --no-daemon
+          arguments: build buildPlugin --no-daemon
 
 
       # Collect Tests Result of failed tests
diff --git a/.github/workflows/multi-os-build.yml b/.github/workflows/multi-os-build.yml
@@ -41,7 +41,7 @@ jobs:
         uses: gradle/gradle-build-action@v2.2.2
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/main' }}
-          arguments: buildPlugin --no-daemon
+          arguments: build buildPlugin --no-daemon
 
 
       # Collect Tests Result of failed tests
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -11,6 +11,7 @@ jobs:
 
   # Prepare and publish the plugin to the Marketplace repository
   publish:
+#    todo: if: "github.event.release.released"
     name: Publish Plugin
     runs-on: ubuntu-latest
     steps:
diff --git a/analytics-provider/build.gradle.kts b/analytics-provider/build.gradle.kts
@@ -28,6 +28,10 @@ testing {
                 all {
                     testTask.configure {
                         setForkEvery(1L) //because MockWebServer is static
+
+                        //this is only to silent the warning : see https://stackoverflow.com/questions/60915381/retrofit2-maven-project-illegal-reflective-access-warning
+                        //WARNING: Illegal reflective access by retrofit2.Platform (file:/home/shalom/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.9.0/d8fdfbd5da952141a665a403348b74538efc05ff/retrofit-2.9.0.jar) to constructor java.lang.invoke.MethodHandles$Lookup(java.lang.Class,int)
+                        jvmArgs = listOf("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED")
                     }
                 }
             }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -93,7 +93,10 @@ tasks {
     wrapper {
         gradleVersion = properties("gradleVersion")
         distributionType = Wrapper.DistributionType.ALL
-        distributionBase = Wrapper.PathBase.PROJECT
+        distributionBase = Wrapper.PathBase.GRADLE_USER_HOME
+        distributionPath = "wrapper/dists"
+        archiveBase = Wrapper.PathBase.GRADLE_USER_HOME
+        archivePath = "wrapper/dists"
     }
 
     patchPluginXml {
@@ -153,12 +156,10 @@ tasks {
         //rider contributes to prepareSandbox, so it needs to run before runIde
         dependsOn("prepareSandbox")
         dependsOn(":rider:prepareSandboxForRider")
-        maxHeapSize = "4g"
+        maxHeapSize = "2g"
         // Rider's backend doesn't support dynamic plugins. It might be possible to work with auto-reload of the frontend
         // part of a plugin, but there are dangers about keeping plugins in sync
         autoReloadPlugins.set(false)
-        //todo: workaround, it's a Gradle IntelliJ Plugin issue, it will be fixed in version 1.8.0 according to jetbrains developers.
-        jvmArgs = listOf("--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED")
     }
 
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -12,7 +12,7 @@ repositories {
 
 dependencies {
     //Note: gradle-intellij-plugin 1.5.3 has some bugs with runIde that does not detect changes in kotlin UI DSL
-    implementation("org.jetbrains.intellij.plugins:gradle-intellij-plugin:1.7.0")
+    implementation("org.jetbrains.intellij.plugins:gradle-intellij-plugin:1.8.0")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
     implementation("com.dorongold.plugins:task-tree:2.1.0")
     implementation("com.glovoapp.semantic-versioning:com.glovoapp.semantic-versioning.gradle.plugin:1.1.10")
@@ -29,13 +29,6 @@ kotlin {
     }
 }
 
-/*
-todo: upgrade gradle to 7.5
-this warning can be ignored:
-'compileJava' task (current target is 11) and 'compileKotlin' task (current target is 1.8) jvm target compatibility should be set to the same Java version.
-gradle issue:
-https://github.com/gradle/gradle/issues/18935
- */
 
 tasks {
 
diff --git a/buildSrc/src/main/kotlin/common-java-library.gradle.kts b/buildSrc/src/main/kotlin/common-java-library.gradle.kts
@@ -1,76 +1,18 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
+//this plugin is for projects that are pure java, meaning they don't have the
+//org.jetbrains.intellij plugin.
+//for example analytics-provider, model
+
 plugins {
     id("digma-base")
     `java-library`
 }
 
 
 tasks {
-    create("buildPlugin") {
-        //a workaround: if the project is built by calling buildPlugin
-        // then build is not called for projects that are not intellij plugin project.
-        dependsOn(build)
-    }
-
-
-    withType<Test> {
-        doFirst {
-            logger.lifecycle("${project.name}:${name}: testing java with {}", javaLauncher.get().executablePath)
-        }
-
-        addTestListener(object : TestListener {
-            override fun beforeTest(testDescriptor: TestDescriptor) {}
-            override fun afterTest(testDescriptor: TestDescriptor, result: TestResult) {}
-
-            override fun beforeSuite(suite: TestDescriptor) {
-                if (suite.parent == null) { // root suite
-                    logger.lifecycle("Starting Test suite {}", suite)
-                }
-            }
-
-            override fun afterSuite(suite: TestDescriptor, result: TestResult) {
-                if (suite.parent == null) { // root suite
-                    logger.lifecycle(
-                        "Test suite ${suite.name} completed:: ${result.resultType}, " +
-                                "success ${result.successfulTestCount}, " +
-                                "failed ${result.failedTestCount}, " +
-                                "skipped ${result.skippedTestCount}."
-                    )
-
-                }
-            }
-        })
-
-
-        testLogging {
-            lifecycle {
-                events = mutableSetOf(TestLogEvent.FAILED)
-                exceptionFormat = TestExceptionFormat.SHORT
-                showExceptions = true
-                showCauses = true
-                showStackTraces = false
-                showStandardStreams = false
-            }
-            debug {
-                events = mutableSetOf(TestLogEvent.FAILED, TestLogEvent.PASSED, TestLogEvent.SKIPPED)
-                exceptionFormat = TestExceptionFormat.FULL
-                showExceptions = true
-                showCauses = true
-                showStackTraces = true
-                showStandardStreams = true
-            }
-            info.events = debug.events
-            info.exceptionFormat = debug.exceptionFormat
-
-
-        }
-
-        addTestOutputListener { testDescriptor, outputEvent ->
-            if (outputEvent.destination == TestOutputEvent.Destination.StdErr) {
-                logger.error("Test: " + testDescriptor + ", error: " + outputEvent.message)
-            }
-        }
-    }
+    //a workaround: if the project is built by calling buildPlugin
+    // then build is not called for projects that are not intellij plugin project.
+    create("buildPlugin").dependsOn(build)
 }
diff --git a/buildSrc/src/main/kotlin/common-kotlin.gradle.kts b/buildSrc/src/main/kotlin/common-kotlin.gradle.kts
@@ -23,9 +23,8 @@ plugins {
 
 kotlin {
     jvmToolchain {
-            (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(properties("javaVersion", project)))
-        //to build with amazon corretto download it in the gradlew script. see resharper-unity
-        //vendor.set(JvmVendorSpec.AMAZON)
+            this.languageVersion.set(JavaLanguageVersion.of(properties("javaVersion", project)))
+            this.vendor.set(JvmVendorSpec.AMAZON)
     }
 }
 
diff --git a/buildSrc/src/main/kotlin/digma-base.gradle.kts b/buildSrc/src/main/kotlin/digma-base.gradle.kts
@@ -1,4 +1,9 @@
 import common.properties
+import gradle.kotlin.dsl.accessors._32850698d653820f6f0bff6e9d585ccb.build
+import gradle.kotlin.dsl.accessors._744ce3376bf13942cde73334c3c9bc84.kotlin
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins{
     `java`
@@ -22,8 +27,7 @@ tasks.incrementSemanticVersion{
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(properties("javaVersion",project)))
-        //to build with amazon corretto download it in the gradlew script. see resharper-unity
-        //vendor.set(JvmVendorSpec.AMAZON)
+        vendor.set(JvmVendorSpec.AMAZON)
     }
 }
 
@@ -41,4 +45,88 @@ configurations {
             sortArtifacts(ResolutionStrategy.SortOrder.DEPENDENCY_FIRST)
         }
     }
-}
+}
+
+
+project.afterEvaluate{
+    tasks{
+        //the project can be built with build task or buildPlugin task. build triggers buildPlugin.
+        //but buildPlugin doesn't trigger build, so if calling only buildPlugin unit tests will not run.
+        //if the project is built by calling buildPlugin we want it to trigger test.
+        named("buildPlugin"){
+            dependsOn(test)
+        }
+    }
+}
+
+
+tasks{
+
+    withType<JavaCompile> {
+        options.compilerArgs.addAll(listOf("-Xlint:unchecked,deprecation"))
+    }
+
+
+    //configuration of test tasks logging
+    withType<Test> {
+        doFirst {
+            logger.lifecycle("${project.name}:${name}: testing java with {}", javaLauncher.get().executablePath)
+        }
+
+        addTestListener(object : TestListener {
+            override fun beforeTest(testDescriptor: TestDescriptor) {}
+            override fun afterTest(testDescriptor: TestDescriptor, result: TestResult) {}
+
+            override fun beforeSuite(suite: TestDescriptor) {
+                if (suite.parent == null) { // root suite
+                    logger.lifecycle("Starting Test suite {}", suite)
+                }
+            }
+
+            override fun afterSuite(suite: TestDescriptor, result: TestResult) {
+                if (suite.parent == null) { // root suite
+                    logger.lifecycle(
+                        "Test suite ${suite.name} completed:: ${result.resultType}, " +
+                                "success ${result.successfulTestCount}, " +
+                                "failed ${result.failedTestCount}, " +
+                                "skipped ${result.skippedTestCount}."
+                    )
+
+                }
+            }
+        })
+
+
+        testLogging {
+            lifecycle {
+                events = mutableSetOf(TestLogEvent.FAILED)
+                exceptionFormat = TestExceptionFormat.SHORT
+                showExceptions = true
+                showCauses = true
+                showStackTraces = false
+                showStandardStreams = false
+            }
+            debug {
+                events = mutableSetOf(TestLogEvent.FAILED, TestLogEvent.PASSED, TestLogEvent.SKIPPED)
+                exceptionFormat = TestExceptionFormat.FULL
+                showExceptions = true
+                showCauses = true
+                showStackTraces = true
+                showStandardStreams = true
+            }
+            info.events = debug.events
+            info.exceptionFormat = debug.exceptionFormat
+
+
+        }
+
+        addTestOutputListener { testDescriptor, outputEvent ->
+            if (outputEvent.destination == TestOutputEvent.Destination.StdErr) {
+                logger.error("Test: " + testDescriptor + ", error: " + outputEvent.message)
+            }
+        }
+    }
+
+
+
+}
diff --git a/gradle.properties b/gradle.properties
@@ -27,7 +27,7 @@ platformPlugins =
 javaVersion = 11
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 7.4.2
+gradleVersion=7.5.1
 
 # Opt-out flag for bundling Kotlin standard library.
 # See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/ide-common/build.gradle.kts b/ide-common/build.gradle.kts
diff --git a/model/build.gradle.kts b/model/build.gradle.kts
diff --git a/model/src/main/java/org/digma/intellij/plugin/model/Models.java b/model/src/main/java/org/digma/intellij/plugin/model/Models.java
diff --git a/settings.gradle.kts b/settings.gradle.kts
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/list/insights/HotspotPanel.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/list/insights/HotspotPanel.kt
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/list/insights/PreviewListCellRenderer.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/list/insights/PreviewListCellRenderer.kt

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,10 @@ testing {`
`28`	`28`	`all {`
`29`	`29`	`testTask.configure {`
`30`	`30`	`setForkEvery(1L) //because MockWebServer is static`
	`31`	`+`
	`32`	`+ //this is only to silent the warning : see https://stackoverflow.com/questions/60915381/retrofit2-maven-project-illegal-reflective-access-warning`
	`33`	`+ //WARNING: Illegal reflective access by retrofit2.Platform (file:/home/shalom/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.9.0/d8fdfbd5da952141a665a403348b74538efc05ff/retrofit-2.9.0.jar) to constructor java.lang.invoke.MethodHandles$Lookup(java.lang.Class,int)`
	`34`	`+ jvmArgs = listOf("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED")`
`31`	`35`	`}`
`32`	`36`	`}`
`33`	`37`	`}`