Upgraded Gradle to 8.0, AGP to 8.0.2, Kotlin to 1.8.20 + Declare namespace in app/build.gradle.kts

vkryl · vkryl · commit e9a054a0f469 · 2023-05-26T19:00:08.000+04:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -37,6 +37,8 @@ val properties = extra["properties"] as Properties
 val projectName = extra["app_name"] as String
 
 android {
+  namespace = "org.thunderdog.challegram"
+
   defaultConfig {
     val versions = extra["versions"] as Properties
     val jniVersion = versions.getIntOrThrow("version.jni")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  package="org.thunderdog.challegram"
   android:installLocation="auto">
 
   <uses-sdk tools:overrideLibrary="androidx.camera.camera2, androidx.camera.core, androidx.camera.view, androidx.camera.lifecycle, androidx.camera.extensions, com.otaliastudios.transcoder, com.otaliastudios.opengl, com.linkedin.android.litr, com.linkedin.android.litr.filter" />
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
   `kotlin-dsl`
 }
 
-val kotlinVersion = "1.8.10"
+val kotlinVersion = "1.8.20"
 
 gradlePlugin {
   plugins {
@@ -45,7 +45,7 @@ configurations.all {
 
 dependencies {
   compileOnly(gradleApi())
-  implementation("com.android.tools.build:gradle:7.4.2")
+  implementation("com.android.tools.build:gradle:8.0.2")
   implementation("com.google.gms:google-services:4.3.15")
   implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
   implementation("com.squareup.okhttp3:okhttp:4.9.3")
diff --git a/buildSrc/src/main/kotlin/me/vkryl/plugin/ModulePlugin.kt b/buildSrc/src/main/kotlin/me/vkryl/plugin/ModulePlugin.kt
@@ -214,8 +214,6 @@ open class ModulePlugin : Plugin<Project> {
               PullRequest(it.toLong(), properties)
             }.sortedBy { it.id }
 
-            namespace = "org.thunderdog.challegram"
-
             defaultConfig {
               applicationId = appId
 
diff --git a/gradle.properties b/gradle.properties
@@ -18,3 +18,5 @@ android.nonTransitiveRClass=true
 org.gradle.jvmargs=-Xms1024m -Xmx8192m -Dkotlin.daemon.jvm.options\="-Xms1024m -Xmx8192M" -Dfile.encoding\=UTF-8
 org.gradle.daemon=true
 org.gradle.parallel=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
diff --git 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.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
