Update Gradle and SDK version

squti · squti · commit 4566499881b0 · 2023-11-22T13:40:14.000+03:30
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/android-wave-recorder/build.gradle b/android-wave-recorder/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 android {
-    compileSdkVersion 32
 
 
     defaultConfig {
+        compileSdk 33
         minSdkVersion 16
-        targetSdkVersion 32
+        targetSdkVersion 33
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -19,6 +19,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.github.squti.androidwaverecorder'
 
 }
 
diff --git a/android-wave-recorder/src/main/AndroidManifest.xml b/android-wave-recorder/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.squti.androidwaverecorder" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/build.gradle b/build.gradle
@@ -7,8 +7,8 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31'
+        classpath 'com.android.tools.build:gradle:8.1.2'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/gradle.properties b/gradle.properties
@@ -19,3 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+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
@@ -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.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -5,11 +5,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 32
     defaultConfig {
+        compileSdk 33
         applicationId "com.github.squti.androidwaverecordersample"
         minSdkVersion 16
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -20,6 +20,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.github.squti.androidwaverecordersample'
 }
 
 dependencies {
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.squti.androidwaverecordersample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'`
`2`	`2`	`apply plugin: 'kotlin-android'`
`3`	`3`	`apply plugin: 'kotlin-android-extensions'`
`4`	`4`	`android {`
`5`		`- compileSdkVersion 32`
`6`	`5`
`7`	`6`
`8`	`7`	`defaultConfig {`
	`8`	`+ compileSdk 33`
`9`	`9`	`minSdkVersion 16`
`10`		`- targetSdkVersion 32`
	`10`	`+ targetSdkVersion 33`
`11`	`11`
`12`	`12`	`testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`13`	`13`	`consumerProguardFiles 'consumer-rules.pro'`
`@@ -19,6 +19,7 @@ android {`
`19`	`19`	`proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'`
`20`	`20`	`}`
`21`	`21`	`}`
	`22`	`+ namespace 'com.github.squti.androidwaverecorder'`
`22`	`23`
`23`	`24`	`}`
`24`	`25`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-<manifest xmlns:android="http://schemas.android.com/apk/res/android"`
`2`		`- package="com.github.squti.androidwaverecorder" />`
	`1`	`+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ buildscript {`
`7`	`7`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:7.1.3'`
`11`		`- classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31'`
	`10`	`+ classpath 'com.android.tools.build:gradle:8.1.2'`
	`11`	`+ classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'`
`12`	`12`	`// NOTE: Do not place your application dependencies here; they belong`
`13`	`13`	`// in the individual module build.gradle files`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,11 @@ apply plugin: 'kotlin-android'`
`5`	`5`	`apply plugin: 'kotlin-android-extensions'`
`6`	`6`
`7`	`7`	`android {`
`8`		`- compileSdkVersion 32`
`9`	`8`	`defaultConfig {`
	`9`	`+ compileSdk 33`
`10`	`10`	`applicationId "com.github.squti.androidwaverecordersample"`
`11`	`11`	`minSdkVersion 16`
`12`		`- targetSdkVersion 32`
	`12`	`+ targetSdkVersion 33`
`13`	`13`	`versionCode 1`
`14`	`14`	`versionName "1.0"`
`15`	`15`	`testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`@@ -20,6 +20,7 @@ android {`
`20`	`20`	`proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'`
`21`	`21`	`}`
`22`	`22`	`}`
	`23`	`+ namespace 'com.github.squti.androidwaverecordersample'`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`dependencies {`