Merge pull request #380 from lucasnlm/update-app

Gradle update
lucasnlm · Sep 21, 2022 · c476067 · c476067
2 parents 1388475 + a6eaa74
commit c476067
Show file tree

Hide file tree

Showing 34 changed files with 33 additions and 27 deletions.
diff --git a/about/build.gradle b/about/build.gradle
@@ -30,6 +30,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'dev.lucasnlm.antimine.about'
 }
 
 dependencies {

diff --git a/about/src/main/AndroidManifest.xml b/about/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="dev.lucasnlm.antimine.about">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity

diff --git a/app/build.gradle b/app/build.gradle
@@ -95,6 +95,7 @@ android {
             applicationId 'dev.lucanlm.antimine'
         }
     }
+    namespace 'dev.lucasnlm.antimine'
 }
 
 kapt {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:dist="http://schemas.android.com/apk/distribution"
     xmlns:tools="http://schemas.android.com/tools"
-    package="dev.lucasnlm.antimine"
     android:installLocation="auto">
 
     <supports-screens

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10'
 
         if (System.getenv('IS_GOOGLE_BUILD')) {

diff --git a/common/build.gradle b/common/build.gradle
@@ -23,6 +23,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace 'dev.lucasnlm.antimine.common'
 }
 
 kapt {

diff --git a/common/src/main/AndroidManifest.xml b/common/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="dev.lucasnlm.antimine.common">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.VIBRATE" />
 

diff --git a/control/build.gradle b/control/build.gradle
@@ -30,6 +30,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'dev.lucasnlm.antimine.control'
 }
 
 dependencies {

diff --git a/control/src/main/AndroidManifest.xml b/control/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="dev.lucasnlm.antimine.control"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.VIBRATE" />
 

diff --git a/core/build.gradle b/core/build.gradle
@@ -29,6 +29,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'dev.lucasnlm.antimine.core'
 }
 
 dependencies {

diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest  xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.lucasnlm.antimine.core">
+<manifest  xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.VIBRATE" />
 </manifest>
diff --git a/external/build.gradle b/external/build.gradle
@@ -26,6 +26,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'dev.lucasnlm.external'
 }
 
 dependencies {

diff --git a/external/src/main/AndroidManifest.xml b/external/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="dev.lucasnlm.external">
+<manifest>
 
 </manifest>
diff --git a/foss/build.gradle b/foss/build.gradle
@@ -18,6 +18,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'dev.lucasnlm.foss'
 }
 
 dependencies {

diff --git a/foss/src/main/AndroidManifest.xml b/foss/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="dev.lucasnlm.foss" />
+<manifest />
diff --git a/gdx/build.gradle b/gdx/build.gradle
@@ -35,6 +35,7 @@ android {
             jniLibs.srcDirs = ['libs']
         }
     }
+    namespace 'dev.lucasnlm.antimine.gdx'
 }
 
 configurations { natives }

diff --git a/gdx/src/main/AndroidManifest.xml b/gdx/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="dev.lucasnlm.antimine.gdx">
+<manifest>
 </manifest>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Dec 12 18:53:07 BRT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/i18n/build.gradle b/i18n/build.gradle
@@ -29,6 +29,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'dev.lucasnlm.antimine.i18n'
 }
 
 dependencies {

diff --git a/i18n/src/main/AndroidManifest.xml b/i18n/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="dev.lucasnlm.antimine.i18n" />
+<manifest />
diff --git a/instant/build.gradle b/instant/build.gradle
@@ -26,6 +26,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'dev.lucasnlm.antimine.instant'
 }
 
 dependencies {

diff --git a/instant/src/main/AndroidManifest.xml b/instant/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:dist="http://schemas.android.com/apk/distribution"
-    package="dev.lucasnlm.antimine.instant">
+    xmlns:dist="http://schemas.android.com/apk/distribution">
 
     <uses-permission android:name="android.permission.INTERNET" />
 

diff --git a/preferences/build.gradle b/preferences/build.gradle
@@ -29,6 +29,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'dev.lucasnlm.antimine.preferences'
 }
 
 dependencies {

diff --git a/preferences/src/main/AndroidManifest.xml b/preferences/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="dev.lucasnlm.antimine.preferences" />
+<manifest />
diff --git a/proprietary/build.gradle b/proprietary/build.gradle
@@ -29,6 +29,7 @@ android {
                 '-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi',
                 '-Xuse-experimental=kotlinx.coroutines.FlowPreview']
     }
+    namespace 'dev.lucasnlm.antimine'
 }
 
 dependencies {

diff --git a/proprietary/src/main/AndroidManifest.xml b/proprietary/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.lucasnlm.antimine">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />

diff --git a/sgtatham/build.gradle b/sgtatham/build.gradle
@@ -38,6 +38,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'dev.lucasnlm.antimine.sgtatham'
 }
 
 dependencies {

diff --git a/sgtatham/src/main/AndroidManifest.xml b/sgtatham/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.lucasnlm.antimine.sgtatham">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
diff --git a/themes/build.gradle b/themes/build.gradle
@@ -30,6 +30,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'dev.lucasnlm.antimine.themes'
 }
 
 dependencies {

diff --git a/themes/src/main/AndroidManifest.xml b/themes/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="dev.lucasnlm.antimine.themes">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity

diff --git a/tutorial/build.gradle b/tutorial/build.gradle
@@ -30,6 +30,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'dev.lucasnlm.antimine.tutorial'
 }
 
 dependencies {

diff --git a/tutorial/src/main/AndroidManifest.xml b/tutorial/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="dev.lucasnlm.antimine.tutorial">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity

diff --git a/ui/build.gradle b/ui/build.gradle
@@ -29,6 +29,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'dev.lucasnlm.antimine.ui'
 }
 
 dependencies {

diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="dev.lucasnlm.antimine.ui">
+<manifest>
 
 </manifest>