Use jvm toolchain with kotlin

erikeelde · Jan 12, 2024 · bdb7587 · bdb7587
1 parent 40f7f3e
commit bdb7587
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 27 deletions.
diff --git a/.github/workflows/core-release.yml b/.github/workflows/core-release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Check out java
         uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'zulu'
           java-version: 17
 
       - name: Copy CI gradle.properties

diff --git a/.github/workflows/flow-noop-release.yml b/.github/workflows/flow-noop-release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Check out java
         uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'zulu'
           java-version: 17
 
       - name: Copy CI gradle.properties

diff --git a/.github/workflows/flow-release.yml b/.github/workflows/flow-release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Check out java
         uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'zulu'
           java-version: 17
 
       - name: Copy CI gradle.properties

diff --git a/.github/workflows/post-merge.yml b/.github/workflows/post-merge.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Check out java
         uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'zulu'
           java-version: 17
 
       - name: Copy CI gradle.properties

diff --git a/.github/workflows/prefs-noop-release.yml b/.github/workflows/prefs-noop-release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Check out java
         uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'zulu'
           java-version: 17
 
       - name: Copy CI gradle.properties

diff --git a/.github/workflows/prefs-release.yml b/.github/workflows/prefs-release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Check out java
         uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'zulu'
           java-version: 17
 
       - name: Copy CI gradle.properties

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Check out java
         uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'zulu'
           java-version: 17
 
       - name: Copy CI gradle.properties

diff --git a/.github/workflows/release_workflow.yml b/.github/workflows/release_workflow.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Check out java
         uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'zulu'
           java-version: 17
 
       - name: Copy CI gradle.properties

diff --git a/build-logic/conventions/build.gradle.kts b/build-logic/conventions/build.gradle.kts
@@ -5,7 +5,6 @@ plugins {
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
-        vendor.set(JvmVendorSpec.AZUL)
     }
 }
 

diff --git a/build-logic/conventions/src/main/kotlin/toggles.android.application-conventions.gradle.kts b/build-logic/conventions/src/main/kotlin/toggles.android.application-conventions.gradle.kts
@@ -43,10 +43,9 @@ android {
     }
 }
 
-java {
-    toolchain {
+kotlin {
+    jvmToolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
-        vendor.set(JvmVendorSpec.AZUL)
     }
 }
 

diff --git a/build-logic/conventions/src/main/kotlin/toggles.android.library-conventions.gradle.kts b/build-logic/conventions/src/main/kotlin/toggles.android.library-conventions.gradle.kts
@@ -39,10 +39,9 @@ android {
     }
 }
 
-java {
-    toolchain {
+kotlin {
+    jvmToolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
-        vendor.set(JvmVendorSpec.AZUL)
     }
 }
 

diff --git a/build-logic/conventions/src/main/kotlin/toggles.android.module-conventions.gradle.kts b/build-logic/conventions/src/main/kotlin/toggles.android.module-conventions.gradle.kts
@@ -31,7 +31,6 @@ android {
 kotlin {
     jvmToolchain {
         languageVersion.set(JavaLanguageVersion.of(JavaVersion.VERSION_17.toString()))
-        vendor.set(JvmVendorSpec.AZUL)
     }
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -117,7 +117,7 @@ androidx-vectordrawable = { module = "androidx.vectordrawable:vectordrawable", v
 androidx-vectordrawable-vectordrawable-animated = { module = "androidx.vectordrawable:vectordrawable-animated", version.ref = "androidx-vectordrawable" }
 androidx-versionedparcelable = "androidx.versionedparcelable:versionedparcelable:1.1.1"
 androidx-viewpager = "androidx.viewpager:viewpager:1.0.0"
-app-cash-licensee-licensee-gradle-plugin = "app.cash.licensee:licensee-gradle-plugin:1.7.0"
+app-cash-licensee-licensee-gradle-plugin = "app.cash.licensee:licensee-gradle-plugin:1.8.0"
 com-android-tools-build-gradle = "com.android.tools.build:gradle:8.2.0"
 com-google-android-datatransport-transport-api = "com.google.android.datatransport:transport-api:3.0.0"
 com-google-android-gms-play-services-ads-identifier = "com.google.android.gms:play-services-ads-identifier:18.0.0"

diff --git a/modules/oss/build.gradle.kts b/modules/oss/build.gradle.kts
@@ -1,8 +1,6 @@
 plugins {
     id("toggles.android.module-conventions")
     id("toggles.ownership-conventions")
-    //id("app.cash.licensee")
-    //id("se.premex.gross") version "0.1.0"
     id("com.google.devtools.ksp")
 }
 

diff --git a/toggles-app/build.gradle.kts b/toggles-app/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
     id("com.github.triplet.play")
     id("com.google.firebase.crashlytics")
     id("app.cash.licensee")
-    id("se.premex.gross") version "0.1.0"
+    id("se.premex.gross") version "0.2.0"
     id("com.google.devtools.ksp")
 }
 

diff --git a/toggles-sample/build.gradle.kts b/toggles-sample/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("dagger.hilt.android.plugin")
     id("toggles.ownership-conventions")
     id("app.cash.licensee")
-    id("se.premex.gross") version "0.1.0"
+    id("se.premex.gross") version "0.2.0"
     id("com.google.devtools.ksp")
 }
 
@@ -56,7 +56,6 @@ android {
 kotlin {
     jvmToolchain {
         languageVersion.set(JavaLanguageVersion.of(JavaVersion.VERSION_17.toString()))
-        vendor.set(JvmVendorSpec.AZUL)
     }
 }
 

diff --git a/versions.properties b/versions.properties
@@ -1,6 +1,6 @@
-V_VERSION=1.02.00
-V_VERSION_CODE=102000
-V_DEBUG_VERSION_SUFFIX=34-gc9aafc1-dirty
-V_DEBUG_VERSION=1.02.00-34-gc9aafc1-dirty
-HASH=c9aafc1
+V_VERSION=1.3.0
+V_VERSION_CODE=1003000
+V_DEBUG_VERSION_SUFFIX=7-g40f7f3e-dirty
+V_DEBUG_VERSION=1.3.0-7-g40f7f3e-dirty
+HASH=40f7f3e
 DIRTY=true
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ plugins { @@
     java {
         toolchain {
             languageVersion.set(JavaLanguageVersion.of(17))
-            vendor.set(JvmVendorSpec.AZUL)
         }
     }
@@ Expand Down @@