ソースを参照

chore: Upgrade gradle plugin

Peter Cai 2 年 前
コミット
c6d7db3c59

+ 2 - 2
.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" />

+ 1 - 0
.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$" />

+ 6 - 0
.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>

+ 1 - 1
.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">

+ 1 - 0
app/build.gradle

@@ -29,6 +29,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'im.angry.openeuicc'
 }
 
 dependencies {

+ 0 - 1
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" />

+ 2 - 2
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
 }

+ 3 - 1
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
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false

+ 1 - 1
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

+ 1 - 0
libs/hidden-apis-shim/build.gradle

@@ -27,6 +27,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'im.angry.openeuicc.hidden_apis_shim'
 }
 
 dependencies {

+ 1 - 2
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>

+ 1 - 0
libs/hidden-apis-stub/build.gradle

@@ -4,6 +4,7 @@ plugins {
 
 android {
     compileSdk 31
+    namespace 'im.angry.hidden.apis'
 }
 
 java {

+ 0 - 1
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>