From 193b60f432ceec7b5449ba6d4b99317ae5cf6ef8 Mon Sep 17 00:00:00 2001 From: Erik Eelde Date: Fri, 12 Jan 2024 14:21:29 +0100 Subject: [PATCH] Use jvm toolchain with kotlin --- .github/workflows/core-release.yml | 2 +- .github/workflows/flow-noop-release.yml | 2 +- .github/workflows/flow-release.yml | 2 +- .github/workflows/post-merge.yml | 2 +- .github/workflows/prefs-noop-release.yml | 2 +- .github/workflows/prefs-release.yml | 2 +- .github/workflows/pull-request.yml | 2 +- .github/workflows/release_workflow.yml | 2 +- build-logic/conventions/build.gradle.kts | 1 - .../toggles.android.application-conventions.gradle.kts | 5 ++--- .../toggles.android.library-conventions.gradle.kts | 5 ++--- .../toggles.android.module-conventions.gradle.kts | 1 - gradle/libs.versions.toml | 2 +- modules/oss/build.gradle.kts | 2 -- toggles-app/build.gradle.kts | 2 +- toggles-sample/build.gradle.kts | 3 +-- versions.properties | 10 +++++----- 17 files changed, 20 insertions(+), 27 deletions(-) diff --git a/.github/workflows/core-release.yml b/.github/workflows/core-release.yml index 7753c0ca..5c556e98 100644 --- 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 index 5b310e5d..efdaf977 100644 --- 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 index cc02ae7a..4fe40a5f 100644 --- 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 index 2a3812b0..cf413280 100644 --- 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 index 866ed3d2..44f3e39a 100644 --- 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 index 6f3185c3..16b2c198 100644 --- 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 index 0b5f5824..e3014cce 100644 --- 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 index 5572669f..038521f2 100644 --- 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 index 3349beba..ff3a239f 100644 --- 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 index 219b6e77..aabf6ca6 100644 --- 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 index 920a4116..9a2b6651 100644 --- 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 index 5bf141ff..ce3502f7 100644 --- 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 index 3e4cdd61..e8da1987 100644 --- 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 index 383e6a41..d2de6292 100644 --- 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 index a1165b56..4b21db05 100644 --- 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 index 607b12da..5477784a 100644 --- 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 index b8c62057..997b743f 100644 --- 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