prepare for Gradle 8

mtotschnig · Apr 14, 2023 · 9bc9fab · 9bc9fab
1 parent adc3f91
commit 9bc9fab
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 7 deletions.
diff --git a/PlayLicensingOrig/AndroidManifest.xml b/PlayLicensingOrig/AndroidManifest.xml
@@ -14,7 +14,6 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.vending.licensing"
     android:versionCode="2"
     android:versionName="1.5">
 </manifest>
diff --git a/PlayLicensingOrig/build.gradle b/PlayLicensingOrig/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'com.android.library'
 
 android {
+  namespace "com.google.android.vending.licensing"
   compileSdkVersion project.compileSdkVersion
   defaultConfig {
     minSdkVersion project.minSdkVersion

diff --git a/myExpenses/build.gradle b/myExpenses/build.gradle
@@ -185,7 +185,6 @@ dependencies {
     kapt "com.jakewharton:butterknife-compiler:$butterknifeVersion"
     kapt "com.google.dagger:dagger-compiler:$daggerVersion"
     implementation "com.google.dagger:dagger:$daggerVersion"
-    compileOnly 'javax.annotation:jsr250-api:1.0'
     implementation 'frankiesardo:icepick:3.2.0'
     kapt 'frankiesardo:icepick-processor:3.2.0'
     implementation 'com.google.code.gson:gson:2.10.1'

diff --git a/ocr/build.gradle b/ocr/build.gradle
@@ -45,7 +45,6 @@ dependencies {
     kapt "com.google.dagger:dagger-compiler:$daggerVersion"
     implementation "com.google.dagger:dagger:$daggerVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
-    compileOnly 'javax.annotation:jsr250-api:1.0'
 
     testImplementation "junit:junit:$junitVersion"
     testImplementation "org.assertj:assertj-core:$assertjVersion"

diff --git a/setupwizard/build.gradle b/setupwizard/build.gradle
@@ -7,4 +7,5 @@ android {
         minSdkVersion project.minSdkVersion
         vectorDrawables.useSupportLibrary = true
     }
+    namespace "com.android.setupwizardlib"
 }
diff --git a/setupwizard/main/AndroidManifest.xml b/setupwizard/main/AndroidManifest.xml
@@ -15,6 +15,4 @@
     limitations under the License.
 -->
 
-<manifest package="com.android.setupwizardlib">
-
-</manifest>
+<manifest />
diff --git a/webui/build.gradle b/webui/build.gradle
@@ -37,7 +37,6 @@ dependencies {
     implementation "org.apache.commons:commons-text:$commonsText"
     kapt "com.google.dagger:dagger-compiler:$daggerVersion"
     implementation "com.google.dagger:dagger:$rootProject.daggerVersion"
-    compileOnly 'javax.annotation:jsr250-api:1.0'
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxTextExtJunit"
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"