From 000b764498b1a37996bb87967a4a28f4bc2e6066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Koby=C5=82ko?= <rafakob@gmail.com>
Date: Sat, 25 Feb 2023 10:55:11 +0100
Subject: [PATCH] Upgrade to AS Giraffe

---
 build.gradle.kts                                       |  4 ++--
 buildlogic/build.gradle.kts                            |  8 ++++----
 .../twofasapp/buildlogic/extension/KotlinAndroid.kt    |  6 +++---
 gradle/libs.versions.toml                              | 10 +++++-----
 gradle/wrapper/gradle-wrapper.properties               |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2cd3901c..f3296d77 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 buildscript {
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
-        classpath("org.jetbrains.kotlin:kotlin-serialization:1.7.20")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}")
+        classpath("org.jetbrains.kotlin:kotlin-serialization:${libs.versions.kotlin.get()}")
         classpath("com.google.gms:google-services:4.3.14")
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.2")
     }
diff --git a/buildlogic/build.gradle.kts b/buildlogic/build.gradle.kts
index 53b187d7..431d03be 100644
--- a/buildlogic/build.gradle.kts
+++ b/buildlogic/build.gradle.kts
@@ -10,13 +10,13 @@ repositories {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {
-    compileOnly("com.android.tools.build:gradle:8.0.0-alpha11")
-    compileOnly("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
+    compileOnly("com.android.tools.build:gradle:${libs.versions.agp.get()}")
+    compileOnly("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}")
 }
 
 gradlePlugin {
diff --git a/buildlogic/src/main/java/com/twofasapp/buildlogic/extension/KotlinAndroid.kt b/buildlogic/src/main/java/com/twofasapp/buildlogic/extension/KotlinAndroid.kt
index ac098e42..fbaff15d 100644
--- a/buildlogic/src/main/java/com/twofasapp/buildlogic/extension/KotlinAndroid.kt
+++ b/buildlogic/src/main/java/com/twofasapp/buildlogic/extension/KotlinAndroid.kt
@@ -27,8 +27,8 @@ internal fun Project.applyKotlinAndroid(
         compileOptions {
             isCoreLibraryDesugaringEnabled = true
 
-            sourceCompatibility = JavaVersion.VERSION_11
-            targetCompatibility = JavaVersion.VERSION_11
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
         }
 
         buildFeatures {
@@ -37,7 +37,7 @@ internal fun Project.applyKotlinAndroid(
         }
 
         kotlinOptions {
-            jvmTarget = "11"
+            jvmTarget = "17"
 
             freeCompilerArgs = freeCompilerArgs + listOf(
                 "-opt-in=kotlin.RequiresOptIn",
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 92b94df7..12c5efe6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,18 +1,18 @@
 [versions]
 accompanist = "0.27.0"
-agp = "8.0.0-alpha11"
+agp = "8.1.0-alpha06"
 coil = "2.2.2"
 compose = "1.3.0"
-composeActivity = "1.6.0"
-composeCompiler = "1.3.2"
+composeActivity = "1.6.1"
+composeCompiler = "1.4.3"
 core = "1.9.0"
 espresso = "3.5.0"
 koin = "3.2.2"
 koinAndroid = "3.3.0"
 kotest = "5.5.2"
-kotlin = "1.7.20"
+kotlin = "1.8.10"
 kotlinCoroutines = "1.6.4"
-kotlinKsp = "1.7.20-1.0.6"
+kotlinKsp = "1.8.10-1.0.9"
 ktlint = "3.12.0"
 ktor = "2.1.2"
 material3 = "1.0.1"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae01e9eb..0b1eaeec 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip