Upgrade build tools and target SDK 34

Author: tughi

app/build.gradle

@@ -4,19 +4,21 @@ apply plugin: 'kotlin-kapt'
 
 android {
     namespace 'com.tughi.aggregator'
-
-    compileSdkVersion 33
+    compileSdk 34
 
     defaultConfig {
         applicationId 'com.tughi.aggregator'
 
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
 
         versionName = 'Preview:034'
         versionCode = 299034
     }
 
+    buildFeatures {
+        buildConfig true
+    }
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
@@ -30,19 +32,23 @@ android {
         }
     }
 
-    flavorDimensions 'store'
+    flavorDimensions += 'store'
 
     productFlavors {
-        fdroid {
+        create('fdroid') {
             dimension 'store'
         }
-        google {
+        create('google') {
             dimension 'store'
             applicationIdSuffix ".next"
         }
     }
-}
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+}
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'

app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:targetApi="m">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

app/src/main/java/com/tughi/aggregator/data/Database.kt

@@ -30,20 +30,20 @@ object Database {
                     db.enableWriteAheadLogging()
                 }
 
-                override fun onCreate(database: SupportSQLiteDatabase) {
-                    executeScript(database, 0)
+                override fun onCreate(db: SupportSQLiteDatabase) {
+                    executeScript(db, 0)
                 }
 
-                override fun onUpgrade(database: SupportSQLiteDatabase, oldVersion: Int, newVersion: Int) {
-                    var databaseVersion = database.version
+                override fun onUpgrade(db: SupportSQLiteDatabase, oldVersion: Int, newVersion: Int) {
+                    var databaseVersion = db.version
                     while (databaseVersion != newVersion) {
-                        executeScript(database, databaseVersion)
+                        executeScript(db, databaseVersion)
 
-                        databaseVersion = database.version
+                        databaseVersion = db.version
                     }
                 }
 
-                private fun executeScript(database: SupportSQLiteDatabase, version: Int) {
+                private fun executeScript(db: SupportSQLiteDatabase, version: Int) {
                     val scriptVersion = when {
                         version > 99 -> version.toString()
                         version > 9 -> "0$version"
@@ -78,23 +78,23 @@ object Database {
                             }
                         }
                     } catch (exception: IOException) {
-                        dropDatabase(database, "Cannot upgrade database from version $version")
+                        dropDatabase(db, "Cannot upgrade database from version $version")
                     }
 
-                    database.transaction {
+                    db.transaction {
                         for (statement in scriptStatements) {
-                            database.execSQL(statement)
+                            db.execSQL(statement)
                         }
                     }
                 }
 
-                override fun onDowngrade(database: SupportSQLiteDatabase, oldVersion: Int, newVersion: Int) {
-                    dropDatabase(database, "Cannot downgrade from version $oldVersion to $newVersion")
+                override fun onDowngrade(db: SupportSQLiteDatabase, oldVersion: Int, newVersion: Int) {
+                    dropDatabase(db, "Cannot downgrade from version $oldVersion to $newVersion")
                 }
 
-                private fun dropDatabase(database: SupportSQLiteDatabase, message: String) {
+                private fun dropDatabase(db: SupportSQLiteDatabase, message: String) {
                     Log.e(javaClass.name, message)
-                    onCorruption(database)
+                    onCorruption(db)
                     exitProcess(1)
                 }
             })

build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -22,6 +22,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }

gradle.properties

@@ -13,3 +13,5 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=true
 
 android.useAndroidX=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Aug 20 12:31:31 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME