Run Android Plugin upgrade assistant (#71)

Update to Android Gradle plugin 7.4.2 and apply recommendations to manifest file.
connectrpc · Aug 21, 2023 · 490d859 · 490d859
1 parent 2e45257
commit 490d859
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/examples/android/build.gradle.kts b/examples/android/build.gradle.kts
@@ -19,6 +19,7 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
+    namespace = "build.buf.connect.examples.android"
 }
 
 dependencies {

diff --git a/examples/android/src/main/AndroidManifest.xml b/examples/android/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="build.buf.connect.examples.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ assertj = "3.11.0"
 coroutines = "1.5.2"
 dokka = "1.5.30"
 junit = "4.13.2"
-kotlin = "1.6.10"
+kotlin = "1.6.21"
 kotlinpoet = "1.12.0"
 ktlint = "0.46.0"
 moshi = "1.13.0"
@@ -14,7 +14,7 @@ protobuf = "3.21.12"
 
 [libraries]
 android = { module = "com.google.android:android", version.ref = "android" }
-android-plugin = { module = "com.android.tools.build:gradle", version = "7.1.2" }
+android-plugin = { module = "com.android.tools.build:gradle", version = "7.4.2" }
 androidx-annotations = { module = "androidx.annotation:annotation", version = "1.1.0" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.0.2" }
 androidx-compose = { module = "androidx.activity:activity-compose", version = "1.4.0" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists