From 1ec805441f2872187425530b99b7c9171356fd42 Mon Sep 17 00:00:00 2001 From: githukudenis Date: Fri, 6 Oct 2023 04:40:54 +0300 Subject: [PATCH 1/2] Update java to version 17 --- app/build.gradle.kts | 4 ++-- core/data/build.gradle.kts | 4 ++-- core/database/build.gradle.kts | 4 ++-- core/datastore/build.gradle.kts | 4 ++-- core/designsystem/build.gradle.kts | 4 ++-- core/local/build.gradle.kts | 4 ++-- core/model/build.gradle.kts | 4 ++-- core/ui/build.gradle.kts | 4 ++-- core/util/build.gradle.kts | 4 ++-- feature/habit/build.gradle.kts | 4 ++-- feature/onboarding/build.gradle.kts | 4 ++-- feature/settings/build.gradle.kts | 4 ++-- feature/summary/build.gradle.kts | 4 ++-- feature/usage_stats/build.gradle.kts | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 96b86df..d2eb9a1 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -37,8 +37,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = "1.8" diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts index 989f373..acf419b 100644 --- a/core/data/build.gradle.kts +++ b/core/data/build.gradle.kts @@ -27,8 +27,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = "1.8" diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts index 436046c..46dc93d 100644 --- a/core/database/build.gradle.kts +++ b/core/database/build.gradle.kts @@ -27,8 +27,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = "1.8" diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts index 01fedaa..c9e1e4c 100644 --- a/core/datastore/build.gradle.kts +++ b/core/datastore/build.gradle.kts @@ -27,8 +27,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = "1.8" diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts index 663563b..1b0f93d 100644 --- a/core/designsystem/build.gradle.kts +++ b/core/designsystem/build.gradle.kts @@ -25,8 +25,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = "1.8" diff --git a/core/local/build.gradle.kts b/core/local/build.gradle.kts index 371afd4..6d31bef 100644 --- a/core/local/build.gradle.kts +++ b/core/local/build.gradle.kts @@ -27,8 +27,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = "1.8" diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts index 4537093..d001f3d 100644 --- a/core/model/build.gradle.kts +++ b/core/model/build.gradle.kts @@ -27,8 +27,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = "1.8" diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index 85aae2f..d2c47ba 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -34,8 +34,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = "1.8" diff --git a/core/util/build.gradle.kts b/core/util/build.gradle.kts index c6a5be7..02108b2 100644 --- a/core/util/build.gradle.kts +++ b/core/util/build.gradle.kts @@ -25,8 +25,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = "1.8" diff --git a/feature/habit/build.gradle.kts b/feature/habit/build.gradle.kts index e5b39a6..de86eb3 100644 --- a/feature/habit/build.gradle.kts +++ b/feature/habit/build.gradle.kts @@ -30,8 +30,8 @@ android { compose = true } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = "1.8" diff --git a/feature/onboarding/build.gradle.kts b/feature/onboarding/build.gradle.kts index a627061..ab54480 100644 --- a/feature/onboarding/build.gradle.kts +++ b/feature/onboarding/build.gradle.kts @@ -24,8 +24,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = "1.8" diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts index 0ba95fb..614309c 100644 --- a/feature/settings/build.gradle.kts +++ b/feature/settings/build.gradle.kts @@ -27,8 +27,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = "1.8" diff --git a/feature/summary/build.gradle.kts b/feature/summary/build.gradle.kts index 0ee55df..14a2445 100644 --- a/feature/summary/build.gradle.kts +++ b/feature/summary/build.gradle.kts @@ -27,8 +27,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = "1.8" diff --git a/feature/usage_stats/build.gradle.kts b/feature/usage_stats/build.gradle.kts index 08716a2..79ffb9b 100644 --- a/feature/usage_stats/build.gradle.kts +++ b/feature/usage_stats/build.gradle.kts @@ -27,8 +27,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = "1.8" From 8dfc6893b7be7c27e2482c28a983f947e5304962 Mon Sep 17 00:00:00 2001 From: Denis Githuku Date: Fri, 6 Oct 2023 05:03:27 +0300 Subject: [PATCH 2/2] Update android.yml --- .github/workflows/android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index e519f16..1ab91fa 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -13,10 +13,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: set up JDK 11 + - name: set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' cache: gradle