From c6d7db3c59cbde915439a783973982f152234e80 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 12 Nov 2023 17:01:20 -0500
Subject: [PATCH] chore: Upgrade gradle plugin

---
 .idea/compiler.xml                                 | 4 ++--
 .idea/gradle.xml                                   | 1 +
 .idea/kotlinc.xml                                  | 6 ++++++
 .idea/misc.xml                                     | 2 +-
 app/build.gradle                                   | 1 +
 app/src/main/AndroidManifest.xml                   | 1 -
 build.gradle                                       | 4 ++--
 gradle.properties                                  | 4 +++-
 gradle/wrapper/gradle-wrapper.properties           | 2 +-
 libs/hidden-apis-shim/build.gradle                 | 1 +
 libs/hidden-apis-shim/src/main/AndroidManifest.xml | 3 +--
 libs/hidden-apis-stub/build.gradle                 | 1 +
 libs/hidden-apis-stub/src/main/AndroidManifest.xml | 1 -
 13 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 .idea/kotlinc.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index ed610c4..f87d4c7 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <bytecodeTargetLevel target="1.7">
-      <module name="OpenEUICC.app" target="11" />
-      <module name="OpenEUICC.libs.hidden-apis-shim" target="11" />
+      <module name="OpenEUICC.app" target="17" />
+      <module name="OpenEUICC.libs.hidden-apis-shim" target="17" />
       <module name="OpenEUICC.libs.lpad-sm-dp-plus-connector" target="1.8" />
       <module name="OpenEUICC.libs.lpad-sm-dp-plus-connector.main" target="1.8" />
       <module name="OpenEUICC.libs.lpad-sm-dp-plus-connector.test" target="1.8" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a891be1..e8e911f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,6 +8,7 @@
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="/usr/share/java/gradle" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..7e340a7
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.6.21" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index fee0503..13bf21d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -17,7 +17,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 0896dff..75f4aa3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,6 +29,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'im.angry.openeuicc'
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 20063be..f2d8837 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/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="im.angry.openeuicc"
     tools:ignore="ProtectedPermissions">
 
     <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
diff --git a/build.gradle b/build.gradle
index 0f9adc5..aeac5db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.2.1' apply false
-    id 'com.android.library' version '7.2.1' apply false
+    id 'com.android.application' version '8.1.2' apply false
+    id 'com.android.library' version '8.1.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
     id 'org.jetbrains.kotlin.multiplatform' version '1.6.21' apply false
 }
diff --git a/gradle.properties b/gradle.properties
index cd0519b..022338b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9156693..dab3589 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jun 08 13:28:20 EDT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/libs/hidden-apis-shim/build.gradle b/libs/hidden-apis-shim/build.gradle
index bc537f7..1c7a212 100644
--- a/libs/hidden-apis-shim/build.gradle
+++ b/libs/hidden-apis-shim/build.gradle
@@ -27,6 +27,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'im.angry.openeuicc.hidden_apis_shim'
 }
 
 dependencies {
diff --git a/libs/hidden-apis-shim/src/main/AndroidManifest.xml b/libs/hidden-apis-shim/src/main/AndroidManifest.xml
index fd89b2d..a5918e6 100644
--- a/libs/hidden-apis-shim/src/main/AndroidManifest.xml
+++ b/libs/hidden-apis-shim/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="im.angry.openeuicc.hidden_apis_shim">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/libs/hidden-apis-stub/build.gradle b/libs/hidden-apis-stub/build.gradle
index 99f242a..3b38b3d 100644
--- a/libs/hidden-apis-stub/build.gradle
+++ b/libs/hidden-apis-stub/build.gradle
@@ -4,6 +4,7 @@ plugins {
 
 android {
     compileSdk 31
+    namespace 'im.angry.hidden.apis'
 }
 
 java {
diff --git a/libs/hidden-apis-stub/src/main/AndroidManifest.xml b/libs/hidden-apis-stub/src/main/AndroidManifest.xml
index 38867cc..e777177 100644
--- a/libs/hidden-apis-stub/src/main/AndroidManifest.xml
+++ b/libs/hidden-apis-stub/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="im.angry.hidden.apis"
     tools:ignore="ProtectedPermissions">
 
 </manifest>
\ No newline at end of file