Update kotlin and gradle to the latest version

QuickBirdEng · Jun 1, 2023 · 29adf1c · 29adf1c
1 parent 063b822
commit 29adf1c
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 18 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -10,4 +10,5 @@ repositories {
 dependencies {
     implementation(gradleApi())
     implementation(localGroovy())
+    implementation("com.android.tools.build:gradle:8.0.2")
 }
diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt
@@ -1,8 +1,7 @@
 object Versions {
 
-    const val kotlin = "1.6.2"
-    const val kotlinPlugin = "1.6.20"
-    const val coroutines = "1.6.2"
+    const val kotlin = "1.8.20"
+    const val coroutines = "1.7.0"
     const val test = "1.1.1"
     const val jUnit = "5.5.2"
     const val jUnitPlatform = "1.5.2"
@@ -28,12 +27,12 @@ object Versions {
 object Deps {
 
     object Plugins {
-        const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlinPlugin}"
+        const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
     }
 
     object Kotlin {
         const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Versions.kotlin}"
-        const val reflect = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlinPlugin}"
+        const val reflect = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}"
         const val coroutines =
             "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.coroutines}"
         const val androidCoroutines =

diff --git a/example/build.gradle.kts b/example/build.gradle.kts
@@ -3,12 +3,10 @@ import com.quickbirdstudios.surveykit.ApiKeys.yandexMapsKey
 
 plugins {
     id("com.android.application")
+    id("kotlin-parcelize")
     kotlin("android")
-    id("org.jetbrains.kotlin.android.extensions")
 }
 
-androidExtensions { isExperimental = true }
-
 android {
     compileSdkVersion = Project.Android.compileSdkVersion
 
@@ -21,6 +19,11 @@ android {
         resValue("string", "google_api_key", googleMapsKey())
         resValue("string", "yandex_api_key", yandexMapsKey())
     }
+
+    buildFeatures {
+        viewBinding = true
+    }
+
     packagingOptions {
         jniLibs {
             excludes += setOf("META-INF/*kotlin*")

diff --git a/gradle.properties b/gradle.properties
@@ -4,4 +4,7 @@ org.gradle.parallel=true
 android.useAndroidX=true
 android.enableJetifier=true
 repositoryName=SurveyKit
-projectSummary=Create beautiful surveys on Android
+projectSummary=Create beautiful surveys on Android
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Jun 01 14:36:42 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -7,8 +7,8 @@ buildscript {
 
     dependencies {
         classpath("com.quickbirdstudios:gradle-publishing:0.1.0")
-        classpath("com.android.tools.build:gradle:7.4.2")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20")
+        classpath("com.android.tools.build:gradle:8.0.2")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")
     }
 }
 

diff --git a/survey/build.gradle.kts b/survey/build.gradle.kts
@@ -3,12 +3,10 @@
 plugins {
     id("com.android.library")
     kotlin("android")
-    id("org.jetbrains.kotlin.android.extensions")
     id("gradle-publishing")
+    id("kotlin-parcelize")
 }
 
-androidExtensions { isExperimental = true }
-
 android {
     compileSdkVersion = Project.Android.compileSdkVersion
 
@@ -19,6 +17,10 @@ android {
         testInstrumentationRunner = Project.Android.testInstrumentationRunner
     }
 
+    buildFeatures {
+        viewBinding = true
+    }
+
     testOptions {
         animationsDisabled = true
     }

diff --git a/test/build.gradle.kts b/test/build.gradle.kts
@@ -2,12 +2,10 @@ import com.quickbirdstudios.surveykit.ApiKeys.googleMapsKey
 
 plugins {
     id("com.android.application")
+    id("kotlin-parcelize")
     kotlin("android")
-    id("org.jetbrains.kotlin.android.extensions")
 }
 
-androidExtensions { isExperimental = true }
-
 android {
     compileSdkVersion(Project.Android.compileSdkVersion)
 
@@ -32,6 +30,10 @@ android {
         }
     }
 
+    buildFeatures {
+        viewBinding = true
+    }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8