Upgraded gradle and android studio gradle plugin.

iiordanov · iiordanov · commit 94abbd4ffcea · 2024-12-11T19:13:14.000-05:00
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/CustomVnc-app/build.gradle b/CustomVnc-app/build.gradle
@@ -28,6 +28,7 @@ android {
     lintOptions {
         disable "Instantiatable"
     }
+    namespace 'com.iiordanov.CUSTOM_VNC_APP_PACKAGE_NAME'
 }
 
 dependencies {
diff --git a/CustomVnc-app/src/main/AndroidManifest.xml b/CustomVnc-app/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:tools="http://schemas.android.com/tools"
-    package="com.iiordanov.CUSTOM_VNC_APP_PACKAGE_NAME"
     android:installLocation="auto"
     android:versionCode="115650"
     android:versionName="v5.6.5">
diff --git a/Opaque-app/build.gradle b/Opaque-app/build.gradle
@@ -36,6 +36,7 @@ android {
     lintOptions {
         disable "Instantiatable"
     }
+    namespace 'com.undatech.opaque'
 }
 
 dependencies {
diff --git a/Opaque-app/src/main/AndroidManifest.xml b/Opaque-app/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="com.undatech.opaque"
     android:versionCode="115650"
     android:versionName="v5.6.5">
 
diff --git a/aRDP-app/build.gradle b/aRDP-app/build.gradle
@@ -24,6 +24,7 @@ android {
     lintOptions {
         disable "Instantiatable"
     }
+    namespace 'com.iiordanov.aRDP'
 }
 
 dependencies {
diff --git a/aRDP-app/src/main/AndroidManifest.xml b/aRDP-app/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:tools="http://schemas.android.com/tools"
-    package="com.iiordanov.aRDP"
     android:installLocation="auto"
     android:versionCode="115650"
     android:versionName="v5.6.5">
diff --git a/aSPICE-app/build.gradle b/aSPICE-app/build.gradle
@@ -24,6 +24,7 @@ android {
     lintOptions {
         disable "Instantiatable"
     }
+    namespace 'com.iiordanov.aSPICE'
 }
 
 dependencies {
diff --git a/aSPICE-app/src/main/AndroidManifest.xml b/aSPICE-app/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:tools="http://schemas.android.com/tools"
-    package="com.iiordanov.aSPICE"
     android:installLocation="auto"
     android:versionCode="115650"
     android:versionName="v5.6.5">
diff --git a/bVNC-app/build.gradle b/bVNC-app/build.gradle
@@ -24,6 +24,7 @@ android {
     lintOptions {
         disable "Instantiatable"
     }
+    namespace 'com.iiordanov.bVNC'
 }
 
 dependencies {
diff --git a/bVNC-app/src/main/AndroidManifest.xml b/bVNC-app/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:tools="http://schemas.android.com/tools"
-    package="com.iiordanov.bVNC"
     android:installLocation="auto"
     android:versionCode="115650"
     android:versionName="v5.6.5">
diff --git a/bVNC/build.gradle b/bVNC/build.gradle
@@ -29,6 +29,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.undatech.remoteClientUi'
 }
 
 dependencies {
diff --git a/bVNC/src/main/AndroidManifest.xml b/bVNC/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:tools="http://schemas.android.com/tools"
-    package="com.undatech.remoteClientUi">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/common/build.gradle b/common/build.gradle
@@ -26,6 +26,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'com.morpheusly.common'
 }
 
 dependencies {
diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.morpheusly.common"></manifest>
+<manifest></manifest>
diff --git a/freeaRDP-app/build.gradle b/freeaRDP-app/build.gradle
@@ -24,6 +24,7 @@ android {
     lintOptions {
         disable "Instantiatable"
     }
+    namespace 'com.iiordanov.freeaRDP'
 }
 
 dependencies {
diff --git a/freeaRDP-app/src/main/AndroidManifest.xml b/freeaRDP-app/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:tools="http://schemas.android.com/tools"
-    package="com.iiordanov.freeaRDP"
     android:installLocation="auto"
     android:versionCode="115650"
     android:versionName="v5.6.5">
diff --git a/freeaSPICE-app/build.gradle b/freeaSPICE-app/build.gradle
@@ -24,6 +24,7 @@ android {
     lintOptions {
         disable "Instantiatable"
     }
+    namespace 'com.iiordanov.freeaSPICE'
 }
 
 dependencies {
diff --git a/freeaSPICE-app/src/main/AndroidManifest.xml b/freeaSPICE-app/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:tools="http://schemas.android.com/tools"
-    package="com.iiordanov.freeaSPICE"
     android:installLocation="auto"
     android:versionCode="115650"
     android:versionName="v5.6.5">
diff --git a/freebVNC-app/build.gradle b/freebVNC-app/build.gradle
@@ -24,6 +24,7 @@ android {
     lintOptions {
         disable "Instantiatable"
     }
+    namespace 'com.iiordanov.freebVNC'
 }
 
 dependencies {
diff --git a/freebVNC-app/src/main/AndroidManifest.xml b/freebVNC-app/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:tools="http://schemas.android.com/tools"
-    package="com.iiordanov.freebVNC"
     android:installLocation="auto"
     android:versionCode="115650"
     android:versionName="v5.6.5">
diff --git a/gradle.properties b/gradle.properties
@@ -6,3 +6,6 @@ CUSTOM_VNC_APP_ICON=icon
 android.useAndroidX=true
 android.enableJetifier=true
 android.jetifier.ignorelist=bcprov
+android.defaults.buildfeatures.buildconfig=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,6 +1,7 @@
-#Wed May 24 23:00:43 EDT 2023
 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.9-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/pubkeyGenerator/build.gradle b/pubkeyGenerator/build.gradle
diff --git a/pubkeyGenerator/src/main/AndroidManifest.xml b/pubkeyGenerator/src/main/AndroidManifest.xml
diff --git a/remoteClientLib/build.gradle b/remoteClientLib/build.gradle
diff --git a/remoteClientLib/src/main/AndroidManifest.xml b/remoteClientLib/src/main/AndroidManifest.xml

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ android {`
`28`	`28`	`lintOptions {`
`29`	`29`	`disable "Instantiatable"`
`30`	`30`	`}`
	`31`	`+ namespace 'com.iiordanov.CUSTOM_VNC_APP_PACKAGE_NAME'`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ android {`
`36`	`36`	`lintOptions {`
`37`	`37`	`disable "Instantiatable"`
`38`	`38`	`}`
	`39`	`+ namespace 'com.undatech.opaque'`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ android {`
`24`	`24`	`lintOptions {`
`25`	`25`	`disable "Instantiatable"`
`26`	`26`	`}`
	`27`	`+ namespace 'com.iiordanov.aRDP'`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ android {`
`29`	`29`	`sourceCompatibility JavaVersion.VERSION_1_8`
`30`	`30`	`targetCompatibility JavaVersion.VERSION_1_8`
`31`	`31`	`}`
	`32`	`+ namespace 'com.undatech.remoteClientUi'`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`google()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:7.4.2'`
	`9`	`+ classpath 'com.android.tools.build:gradle:8.7.3'`
`10`	`10`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ android {`
`26`	`26`	`kotlinOptions {`
`27`	`27`	`jvmTarget = '1.8'`
`28`	`28`	`}`
	`29`	`+ namespace 'com.morpheusly.common'`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`		`-<manifest package="com.morpheusly.common"></manifest>`
	`2`	`+<manifest></manifest>`