From d169fc1d3d60559b08b318ce9bc40c9d26205533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?= Date: Tue, 9 Jul 2024 09:23:27 +0200 Subject: [PATCH] fix: using Java 1.8 --- .github/workflows/docs.yml | 2 +- .github/workflows/instrumentation-test.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- app/build.gradle.kts | 6 +++--- gradle/libs.versions.toml | 2 +- maps-compose-utils/build.gradle.kts | 6 +++--- maps-compose-widgets/build.gradle.kts | 6 +++--- maps-compose/build.gradle.kts | 6 +++--- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 24038f4a7..680b854e7 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -37,7 +37,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v4.2.1 with: - java-version: '17' + java-version: '21' distribution: 'adopt' # Run dokka and create tar diff --git a/.github/workflows/instrumentation-test.yml b/.github/workflows/instrumentation-test.yml index 10f2bbaea..7d5dd3cbb 100644 --- a/.github/workflows/instrumentation-test.yml +++ b/.github/workflows/instrumentation-test.yml @@ -40,7 +40,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v4.2.1 with: - java-version: '17' + java-version: '21' distribution: 'adopt' - name: Inject Maps API Key diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4d596489b..164408cba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v4.2.1 with: - java-version: '17' + java-version: '21' distribution: 'adopt' - name: Create .gpg key run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 50a3b7e98..35b1959c6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,7 +40,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v4.2.1 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Build modules diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 111b80aca..fccf6397c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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 { @@ -39,7 +39,7 @@ android { } kotlinOptions { - jvmTarget = "17" + jvmTarget = "1.8" freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn" } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d1def2ada..9ca5fe32d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" diff --git a/maps-compose-utils/build.gradle.kts b/maps-compose-utils/build.gradle.kts index 3a4487fff..fbbc0b2bd 100644 --- a/maps-compose-utils/build.gradle.kts +++ b/maps-compose-utils/build.gradle.kts @@ -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 { @@ -23,7 +23,7 @@ android { } kotlinOptions { - jvmTarget = "17" + jvmTarget = "1.8" freeCompilerArgs += "-Xexplicit-api=strict" freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn" } diff --git a/maps-compose-widgets/build.gradle.kts b/maps-compose-widgets/build.gradle.kts index a233c243e..f39e40d0a 100644 --- a/maps-compose-widgets/build.gradle.kts +++ b/maps-compose-widgets/build.gradle.kts @@ -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 { @@ -23,7 +23,7 @@ android { } kotlinOptions { - jvmTarget = "17" + jvmTarget = "1.8" freeCompilerArgs += listOf( "-Xexplicit-api=strict", "-Xopt-in=kotlin.RequiresOptIn" diff --git a/maps-compose/build.gradle.kts b/maps-compose/build.gradle.kts index 8792f6ce2..b0f424199 100644 --- a/maps-compose/build.gradle.kts +++ b/maps-compose/build.gradle.kts @@ -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 { @@ -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",