From f73545c01e991f17b6d8a7973beedf56827de925 Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Thu, 18 May 2023 23:11:48 +0200
Subject: [PATCH] upgrade to Kotlin 1.8.20

---
 app/build.gradle | 12 +++++++++---
 build.gradle     |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a59870f6..39524e04 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -90,6 +90,12 @@ android {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
 
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs).configureEach {
+        kotlinOptions {
+            jvmTarget = "1.8"
+        }
+    }
+
     buildFeatures {
         dataBinding = true
         viewBinding true
@@ -173,8 +179,8 @@ dependencies {
     implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
     implementation 'com.squareup.okhttp3:okhttp:4.11.0'
     implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.11.0'
-    implementation 'com.squareup.moshi:moshi-kotlin:1.13.0'
-    implementation 'com.squareup.moshi:moshi-adapters:1.13.0'
+    implementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
+    implementation 'com.squareup.moshi:moshi-adapters:1.15.0'
     implementation 'com.markomilos.jsonapi:jsonapi-retrofit:1.1.0'
     implementation 'io.coil-kt:coil:1.1.0'
     implementation 'com.github.ev-map:StfalconImageViewer:5082ebd392'
@@ -260,7 +266,7 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
-    kapt "com.squareup.moshi:moshi-kotlin-codegen:1.13.0"
+    kapt "com.squareup.moshi:moshi-kotlin-codegen:1.15.0"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2'
 }
diff --git a/build.gradle b/build.gradle
index 4864f90f..db5d5108 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.7.21'
+    ext.kotlin_version = '1.8.21'
     ext.about_libs_version = '8.9.4'
     ext.nav_version = '2.5.3'
     repositories {