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

chore: using Java 1.8 #600

Merged
merged 1 commit into from
Jul 9, 2024
Merged

chore: using Java 1.8 #600

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/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Set up JDK 17
uses: actions/[email protected]
with:
java-version: '17'
java-version: '21'
distribution: 'adopt'

# Run dokka and create tar
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/instrumentation-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Set up JDK 17
uses: actions/[email protected]
with:
java-version: '17'
java-version: '21'
distribution: 'adopt'

- name: Inject Maps API Key
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Set up JDK 17
uses: actions/[email protected]
with:
java-version: '17'
java-version: '21'
distribution: 'adopt'
- name: Create .gpg key
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Set up JDK 17
uses: actions/[email protected]
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'

- name: Build modules
Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

buildFeatures {
Expand All @@ -39,7 +39,7 @@ android {
}

kotlinOptions {
jvmTarget = "17"
jvmTarget = "1.8"
freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
}
}
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 @@ -11,7 +11,7 @@ junit = "4.13.2"
kotlin = "2.0.0"
kotlinxCoroutines = "1.8.1"
material = "1.12.0"
mapsktx = "5.1.0"
mapsktx = "5.1.1"
mapsecrets = "2.0.1"
org-jacoco-core = "0.8.11"

Expand Down
6 changes: 3 additions & 3 deletions maps-compose-utils/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

buildFeatures {
Expand All @@ -23,7 +23,7 @@ android {
}

kotlinOptions {
jvmTarget = "17"
jvmTarget = "1.8"
freeCompilerArgs += "-Xexplicit-api=strict"
freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
}
Expand Down
6 changes: 3 additions & 3 deletions maps-compose-widgets/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

buildFeatures {
Expand All @@ -23,7 +23,7 @@ android {
}

kotlinOptions {
jvmTarget = "17"
jvmTarget = "1.8"
freeCompilerArgs += listOf(
"-Xexplicit-api=strict",
"-Xopt-in=kotlin.RequiresOptIn"
Expand Down
6 changes: 3 additions & 3 deletions maps-compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

buildFeatures {
Expand All @@ -24,7 +24,7 @@ android {
}

kotlinOptions {
jvmTarget = "17"
jvmTarget = "1.8"
val stabilityConfigurationFile = layout.projectDirectory.file("compose_compiler_stability_config.conf").asFile
freeCompilerArgs += listOf(
"-Xexplicit-api=strict",
Expand Down
Loading