Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use jvm toolchain with kotlin #389

Merged
merged 1 commit into from
Jan 12, 2024
Merged

Use jvm toolchain with kotlin #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/core-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flow-noop-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flow-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/post-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prefs-noop-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prefs-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion build-logic/conventions/build.gradle.kts
View file
Open in desktop
Original file line number Diff 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
5 changes: 2 additions & 3 deletions build-logic/conventions/src/main/kotlin/toggles.android.application-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,9 @@ android {
}
}

java {
toolchain {
kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(17))
vendor.set(JvmVendorSpec.AZUL)
}
}

Expand Down
5 changes: 2 additions & 3 deletions build-logic/conventions/src/main/kotlin/toggles.android.library-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,9 @@ android {
}
}

java {
toolchain {
kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(17))
vendor.set(JvmVendorSpec.AZUL)
}
}

Expand Down
1 change: 0 additions & 1 deletion build-logic/conventions/src/main/kotlin/toggles.android.module-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ android {
kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(JavaVersion.VERSION_17.toString()))
vendor.set(JvmVendorSpec.AZUL)
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions modules/oss/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
}

Expand Down
2 changes: 1 addition & 1 deletion toggles-app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down
3 changes: 1 addition & 2 deletions toggles-sample/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down Expand Up @@ -56,7 +56,6 @@ android {
kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(JavaVersion.VERSION_17.toString()))
vendor.set(JvmVendorSpec.AZUL)
}
}

Expand Down
10 changes: 5 additions & 5 deletions versions.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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