Update dependency gradle to v8.1.1 (#2103)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Nariman Abdullin <[email protected]>
saveourtool · Apr 26, 2023 · 4971ab8 · 4971ab8
1 parent af12843
commit 4971ab8
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 45 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -14,19 +14,40 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build_and_test_with_code_coverage:
-    name: Build, test and upload code coverage
-    runs-on: ubuntu-20.04
-
+  build_and_test_with_code_coverage_module:
+    name: Build, test and upload code coverage by module
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        module: [
+          'api-gateway',
+          'save-backend',
+          'save-orchestrator-common',
+          'save-orchestrator',
+          'save-frontend',
+          'save-cloud-common',
+          'save-agent',
+          'save-preprocessor',
+          'test-utils',
+          'save-api',
+          'save-api-cli',
+          'save-sandbox',
+          'authentication-service',
+          'save-demo',
+          'save-demo-cpg',
+          'test-analysis-core',
+          'save-demo-agent'
+        ]
     steps:
       - uses: actions/checkout@v3
         with:
           # required for correct codecov upload
           fetch-depth: 0
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
       - name: Install system packages
         # libcurl is needed for ktor-client-curl
@@ -40,36 +61,16 @@ jobs:
         with:
           path: ~/.konan
           key: ${{ runner.os }}-gradle-konan-${{ env.KOTLIN_VERSION }}
-      - name: Build all (excluding save-orchestrator-common, save-orchestrator and save-sandbox)
+      - name: Build ${{ matrix.module }}
         uses: gradle/gradle-build-action@v2
         with:
           gradle-version: wrapper
-          gradle-home-cache-cleanup: true
           arguments: |
-            build
-            -x detekt
-            -x spotlessCheck
-            -x :save-agent:linkDebugExecutableLinuxX64
-            -x :save-orchestrator-common:build
-            -x :save-orchestrator:build
-            -x :save-sandbox:build
-            -Pdetekt.multiplatform.disabled=true
-            -PgprUser=${{ github.actor }}
-            -PgprKey=${{ secrets.GITHUB_TOKEN }}
-            --scan
-            --build-cache
-      - name: Build save-orchestrator-common, save-orchestrator and save-sandbox
-        uses: gradle/gradle-build-action@v2
-        with:
-          gradle-version: wrapper
-          gradle-home-cache-cleanup: true
-          arguments: |
-            :save-orchestrator-common:build
-            :save-orchestrator:build
-            :save-sandbox:build
+            :${{ matrix.module }}:build
             -x detekt
             -x spotlessCheck
             -x :save-agent:linkDebugExecutableLinuxX64
+            -x :save-demo-agent:linkDebugExecutableLinuxX64
             -Pdetekt.multiplatform.disabled=true
             -PgprUser=${{ github.actor }}
             -PgprKey=${{ secrets.GITHUB_TOKEN }}
@@ -84,6 +85,7 @@ jobs:
           path: '**/build/reports/'
           retention-days: 1
       - name: Upload frontend distribution
+        if: matrix.module == 'save-frontend'
         uses: actions/upload-artifact@v3
         with:
           name: save-frontend
@@ -93,3 +95,11 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: false
+
+  build_and_test_with_code_coverage:
+    name: Build, test and upload code coverage
+    needs: [build_and_test_with_code_coverage_module]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Just output
+        run: echo "Finished"
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
+    compilerOptions {
+        freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
     }
 }
diff --git a/gradle/plugins/build.gradle.kts b/gradle/plugins/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
+    compilerOptions {
+        freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
     }
 }
diff --git a/...ugins/src/main/kotlin/com/saveourtool/save/buildutils/kotlin-jvm-configuration.gradle.kts b/...ugins/src/main/kotlin/com/saveourtool/save/buildutils/kotlin-jvm-configuration.gradle.kts
@@ -9,8 +9,8 @@ plugins {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
+    compilerOptions {
+        freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/save-demo/build.gradle.kts b/save-demo/build.gradle.kts
@@ -19,8 +19,8 @@ kotlin {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + "-Xcontext-receivers"
+    compilerOptions {
+        freeCompilerArgs.add("-Xcontext-receivers")
     }
 }
 

diff --git a/save-orchestrator-common/build.gradle.kts b/save-orchestrator-common/build.gradle.kts
@@ -7,8 +7,8 @@ plugins {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + "-Xcontext-receivers"
+    compilerOptions {
+        freeCompilerArgs.add("-Xcontext-receivers")
     }
 }
 

diff --git a/save-orchestrator/build.gradle.kts b/save-orchestrator/build.gradle.kts
@@ -8,8 +8,8 @@ plugins {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + "-Xcontext-receivers"
+    compilerOptions {
+        freeCompilerArgs.add("-Xcontext-receivers")
     }
 }
 

diff --git a/save-sandbox/build.gradle.kts b/save-sandbox/build.gradle.kts
@@ -19,8 +19,8 @@ kotlin {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + "-Xcontext-receivers"
+    compilerOptions {
+        freeCompilerArgs.add("-Xcontext-receivers")
     }
 }