diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index b5766d4..a4e73b7 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -31,10 +31,10 @@ jobs: - name: Checkout android-maps-ktx uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' # Run dokka and create tar diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0266bc0..5744831 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,10 +22,10 @@ jobs: release: runs-on: ubuntu-latest steps: - - name: Set up JDK 17 + - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 06d5c15..f2d103e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,10 +37,10 @@ jobs: - name: Gradle Wrapper Validation uses: gradle/wrapper-validation-action@v3.4.2 - - name: Set up JDK 17 + - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Build modules diff --git a/app/build.gradle b/app/build.gradle index 1a95be9..3c48dbd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,18 +43,17 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = "17" + jvmTarget = "1.8" } namespace 'com.google.maps.android.ktx.demo' } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) implementation libs.kotlinStdlib implementation libs.androidxAppcompat implementation libs.androidxCoreKtx diff --git a/build.gradle b/build.gradle index eee40c0..a9bdb32 100644 --- a/build.gradle +++ b/build.gradle @@ -91,7 +91,7 @@ subprojects { project -> // Code coverage jacoco { - toolVersion = "0.8.7" + toolVersion = "0.8.12" } diff --git a/gradle.properties b/gradle.properties index 0f5da65..b15ad6b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,4 +31,7 @@ sonatypeTokenPassword= # Migration to AGP 8.2.1 android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false + +# Despite being deprecated, targeting lowest java version is needed to support old Android runtime +android.javaCompile.suppressSourceTargetDeprecationWarning=true diff --git a/maps-ktx/build.gradle b/maps-ktx/build.gradle index 36c12fc..ff432ef 100644 --- a/maps-ktx/build.gradle +++ b/maps-ktx/build.gradle @@ -29,13 +29,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { freeCompilerArgs += '-Xexplicit-api=strict' - jvmTarget = "17" + jvmTarget = "1.8" } buildFeatures { viewBinding true diff --git a/maps-utils-ktx/build.gradle b/maps-utils-ktx/build.gradle index ae23af9..e0ebf3c 100644 --- a/maps-utils-ktx/build.gradle +++ b/maps-utils-ktx/build.gradle @@ -34,13 +34,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { freeCompilerArgs += '-Xexplicit-api=strict' - jvmTarget = "17" + jvmTarget = "1.8" } buildFeatures { viewBinding true