Android Studio Koala

hannesa2 · hannesa2 · commit 1acdb88a794f · 2024-08-13T06:48:11.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.2'
     }
 }
 
diff --git a/example/build.gradle b/example/build.gradle
@@ -14,6 +14,7 @@ android {
     lint {
         abortOnError false
     }
+    namespace 'org.openintents.openpgp.example'
 
 }
 
diff --git a/example/src/main/AndroidManifest.xml b/example/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="org.openintents.openpgp.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,4 @@
 android.enableJetifier=true
-android.useAndroidX=true
+android.useAndroidX=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/openpgp-api/build.gradle b/openpgp-api/build.gradle
@@ -20,6 +20,7 @@ android {
     buildFeatures {
         aidl true
     }
+    namespace 'org.openintents.openpgp'
 }
 
 /*
diff --git a/openpgp-api/src/main/AndroidManifest.xml b/openpgp-api/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.openintents.openpgp">
+<manifest>
 
     <application/>
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ buildscript {`
`4`	`4`	`mavenCentral()`
`5`	`5`	`}`
`6`	`6`	`dependencies {`
`7`		`- classpath 'com.android.tools.build:gradle:7.4.2'`
	`7`	`+ classpath 'com.android.tools.build:gradle:8.5.2'`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ android {`
`14`	`14`	`lint {`
`15`	`15`	`abortOnError false`
`16`	`16`	`}`
	`17`	`+ namespace 'org.openintents.openpgp.example'`
`17`	`18`
`18`	`19`	`}`
`19`	`20`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ android {`
`20`	`20`	`buildFeatures {`
`21`	`21`	`aidl true`
`22`	`22`	`}`
	`23`	`+ namespace 'org.openintents.openpgp'`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`/*`