Change target SDK version to 33 (#81)

[80] Update to target Android 13
zelloptt · Aug 19, 2022 · 12b772c · 12b772c
1 parent 4deeb90
commit 12b772c
Show file tree

Hide file tree

Showing 19 changed files with 50 additions and 50 deletions.
diff --git a/zello-sdk-sample-contacts/build.gradle b/zello-sdk-sample-contacts/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 	}
 
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.2"
+        classpath "com.android.tools.build:gradle:7.2.2"
     }
 }
 
@@ -23,13 +23,13 @@ java {
 }
 
 android {
-	compileSdkVersion 30
-	buildToolsVersion "31.0.0"
+	compileSdkVersion 33
+	buildToolsVersion "33.0.0"
 
 	defaultConfig {
 		applicationId "com.zello.sdk.sample.contacts"
-		minSdkVersion 16
-		targetSdkVersion 30
+		minSdkVersion 23
+		targetSdkVersion 33
 		versionCode 1
 		versionName "1.0"
 	}
@@ -49,5 +49,5 @@ android {
 
 dependencies {
 	implementation files("libs/zello-sdk.aar")
-	implementation "androidx.appcompat:appcompat:1.3.1"
+	implementation "androidx.appcompat:appcompat:1.5.0"
 }
diff --git a/zello-sdk-sample-contacts/gradle/wrapper/gradle-wrapper.properties b/zello-sdk-sample-contacts/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-7.5.1-bin.zip
diff --git a/zello-sdk-sample-contacts/libs/zello-sdk.aar b/zello-sdk-sample-contacts/libs/zello-sdk.aar
diff --git a/zello-sdk-sample-misc/build.gradle b/zello-sdk-sample-misc/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.2"
+        classpath "com.android.tools.build:gradle:7.2.2"
     }
 }
 
@@ -17,13 +17,13 @@ repositories {
 apply plugin: "com.android.application"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
     buildToolsVersion "31.0.0"
 
     defaultConfig {
         applicationId "com.zello.sdk.sample.miscellaneous"
-        minSdkVersion 16
-        targetSdkVersion 30
+        minSdkVersion 23
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
@@ -43,5 +43,5 @@ android {
 
 dependencies {
     implementation files("libs/zello-sdk.aar")
-    implementation "androidx.appcompat:appcompat:1.3.1"
+    implementation "androidx.appcompat:appcompat:1.5.0"
 }
diff --git a/zello-sdk-sample-misc/gradle/wrapper/gradle-wrapper.properties b/zello-sdk-sample-misc/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,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-7.5.1-bin.zip
diff --git a/zello-sdk-sample-misc/libs/zello-sdk.aar b/zello-sdk-sample-misc/libs/zello-sdk.aar
diff --git a/zello-sdk-sample-ptt/build.gradle b/zello-sdk-sample-ptt/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.2"
+        classpath "com.android.tools.build:gradle:7.2.2"
     }
 }
 
@@ -17,13 +17,13 @@ repositories {
 apply plugin: "com.android.application"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
     buildToolsVersion "31.0.0"
 
     defaultConfig {
         applicationId "com.zello.sdk.sample.ptt"
-        minSdkVersion 16
-        targetSdkVersion 30
+        minSdkVersion 23
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
@@ -43,5 +43,5 @@ android {
 
 dependencies {
     implementation files("libs/zello-sdk.aar")
-    implementation "androidx.appcompat:appcompat:1.3.1"
+    implementation "androidx.appcompat:appcompat:1.5.0"
 }
diff --git a/zello-sdk-sample-ptt/gradle/wrapper/gradle-wrapper.properties b/zello-sdk-sample-ptt/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,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-7.5.1-bin.zip
diff --git a/zello-sdk-sample-ptt/libs/zello-sdk.aar b/zello-sdk-sample-ptt/libs/zello-sdk.aar
diff --git a/zello-sdk-sample-signin/build.gradle b/zello-sdk-sample-signin/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.2"
+        classpath "com.android.tools.build:gradle:7.2.2"
     }
 }
 
@@ -17,13 +17,13 @@ repositories {
 apply plugin: "com.android.application"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
     buildToolsVersion "31.0.0"
 
     defaultConfig {
         applicationId "com.zello.sdk.sample"
-        minSdkVersion 16
-        targetSdkVersion 30
+        minSdkVersion 23
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
@@ -43,5 +43,5 @@ android {
 
 dependencies {
     implementation files("libs/zello-sdk.aar")
-    implementation "androidx.appcompat:appcompat:1.3.1"
+    implementation "androidx.appcompat:appcompat:1.5.0"
 }
diff --git a/zello-sdk-sample-signin/gradle/wrapper/gradle-wrapper.properties b/zello-sdk-sample-signin/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,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-7.5.1-bin.zip
diff --git a/zello-sdk-sample-signin/libs/zello-sdk.aar b/zello-sdk-sample-signin/libs/zello-sdk.aar
diff --git a/zello-sdk-sample/build.gradle b/zello-sdk-sample/build.gradle
@@ -1,13 +1,13 @@
 buildscript {
-	ext.kotlin_version = "1.5.31"
+	ext.kotlin_version = "1.7.10"
 
 	repositories {
 		google()
 		mavenCentral()
 	}
 
 	dependencies {
-		classpath "com.android.tools.build:gradle:7.0.2"
+		classpath "com.android.tools.build:gradle:7.2.2"
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 	}
 }
@@ -21,13 +21,13 @@ apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
 
 android {
-	compileSdkVersion 30
+	compileSdkVersion 33
 	buildToolsVersion "31.0.0"
 
 	defaultConfig {
 		applicationId "com.zello.sdk.sample"
-		minSdkVersion 16
-		targetSdkVersion 30
+		minSdkVersion 23
+		targetSdkVersion 33
 		versionCode 1
 		versionName "1.0"
 	}
@@ -51,8 +51,8 @@ android {
 
 dependencies {
 	implementation files("libs/zello-sdk.aar")
-	implementation "androidx.appcompat:appcompat:1.3.1"
-	implementation "androidx.core:core-ktx:1.6.0"
-	implementation "androidx.media:media:1.4.2"
+	implementation "androidx.appcompat:appcompat:1.5.0"
+	implementation "androidx.core:core-ktx:1.8.0"
+	implementation "androidx.media:media:1.6.0"
 	implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
diff --git a/zello-sdk-sample/gradle/wrapper/gradle-wrapper.properties b/zello-sdk-sample/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,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-7.5.1-all.zip
diff --git a/zello-sdk-sample/libs/zello-sdk.aar b/zello-sdk-sample/libs/zello-sdk.aar
diff --git a/zello-sdk.aar b/zello-sdk.aar
diff --git a/zello-sdk/build.gradle b/zello-sdk/build.gradle
@@ -1,13 +1,13 @@
 buildscript {
-	ext.kotlin_version = "1.5.31"
+	ext.kotlin_version = "1.7.10"
 
 	repositories {
 		google()
 		mavenCentral()
 	}
 
 	dependencies {
-		classpath "com.android.tools.build:gradle:7.0.2"
+		classpath "com.android.tools.build:gradle:7.2.2"
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 	}
 }
@@ -27,10 +27,10 @@ java {
 }
 
 dependencies {
-	implementation "androidx.appcompat:appcompat:1.3.1"
-	implementation "androidx.core:core-ktx:1.6.0"
-	implementation "androidx.media:media:1.4.2"
-	implementation "androidx.annotation:annotation:1.2.0"
+	implementation "androidx.appcompat:appcompat:1.5.0"
+	implementation "androidx.core:core-ktx:1.8.0"
+	implementation "androidx.media:media:1.6.0"
+	implementation "androidx.annotation:annotation:1.4.0"
 	implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
@@ -95,7 +95,7 @@ task zelloSdkAarDeployReleaseToSamples {
 		rename("${sourceAarName}", "${targetAarName}")
 	}
 	dependencies {
-		implementation "androidx.annotation:annotation:1.2.0"
+		implementation "androidx.annotation:annotation:1.4.0"
 	}
 	shouldRunAfter "assembleRelease"
 }
@@ -141,14 +141,14 @@ tasks.whenTaskAdded { task ->
 }
 
 android {
-	compileSdkVersion 30
-	buildToolsVersion "31.0.0"
+	compileSdkVersion 33
+	buildToolsVersion "33.0.0"
 
 	ext.sdkVersion = "4.116.0"
 
 	defaultConfig {
-		targetSdkVersion 30
-		minSdkVersion 16
+		targetSdkVersion 33
+		minSdkVersion 23
 		manifestPlaceholders = [sdkVersion: "$sdkVersion"]
 		buildConfigField "String", "SDK_VERSION", "\"$sdkVersion\""
 		consumerProguardFiles "consumer-rules.pro"

diff --git a/zello-sdk/gradle/wrapper/gradle-wrapper.properties b/zello-sdk/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 18 13:04:35 CST 2020
+#Sat Aug 13 22:07:02 BST 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/zello-sdk/src/main/java/com/zello/sdk/headset/HeadsetMediaSessionImpl.kt b/zello-sdk/src/main/java/com/zello/sdk/headset/HeadsetMediaSessionImpl.kt
@@ -39,8 +39,8 @@ class HeadsetMediaSessionImpl : HeadsetMediaSession {
 			val mediaButtonIntent = Intent(Intent.ACTION_MEDIA_BUTTON).run {
 				setClass(context.applicationContext, MediaButtonReceiver::class.java)
 			}
-			session.setMediaButtonReceiver(PendingIntent.getBroadcast(context.applicationContext, 0, mediaButtonIntent, 0))
-			session.isActive = true;
+			session.setMediaButtonReceiver(PendingIntent.getBroadcast(context.applicationContext, 0, mediaButtonIntent, PendingIntent.FLAG_IMMUTABLE))
+			session.isActive = true
 			// Switch the session to "playing" state
 			val playbackState = PlaybackStateCompat.Builder().run {
 				setActions(PlaybackStateCompat.ACTION_PLAY_PAUSE or PlaybackStateCompat.ACTION_PAUSE)