From cf08ba7d447e2acdc793a084811113cbb8155fe7 Mon Sep 17 00:00:00 2001 From: Kirill Zhukov Date: Tue, 22 Oct 2024 18:05:57 +0300 Subject: [PATCH] Android 15 support (#277) --- .github/workflows/mr-checks.yml | 4 ++-- .github/workflows/release.yml | 2 +- app/build.gradle | 4 ++-- buildscripts/android-library.gradle | 4 ++-- buildscripts/properties.gradle | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/mr-checks.yml b/.github/workflows/mr-checks.yml index 0b34dd2f..34cebb71 100644 --- a/.github/workflows/mr-checks.yml +++ b/.github/workflows/mr-checks.yml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 17 + java-version: 21 - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 @@ -43,7 +43,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 17 + java-version: 21 - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7e907e51..5c8fc4c6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: "temurin" - name: Setup Ruby diff --git a/app/build.gradle b/app/build.gradle index ce7d4df0..b959aa5e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,8 +36,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 } kotlin { compilerOptions { diff --git a/buildscripts/android-library.gradle b/buildscripts/android-library.gradle index 71b00dc5..a1896eeb 100644 --- a/buildscripts/android-library.gradle +++ b/buildscripts/android-library.gradle @@ -14,8 +14,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 } kotlin { compilerOptions { diff --git a/buildscripts/properties.gradle b/buildscripts/properties.gradle index b6e6dca5..57dae0a3 100644 --- a/buildscripts/properties.gradle +++ b/buildscripts/properties.gradle @@ -1,5 +1,5 @@ project.ext { minSdk = 21 - targetSdk = 34 - compileSdk = 34 + targetSdk = 35 + compileSdk = 35 }