更新Android S

zhujiang2 · zhujiang2 · commit 3386910e2e62 · 2021-12-09T21:16:57.000+08:00
diff --git a/apk/app-release.apk b/apk/app-release.apk
diff --git a/apk/app-release_7zip_aligned_signed.apk b/apk/app-release_7zip_aligned_signed.apk
diff --git a/app/and_res_guard.gradle b/app/and_res_guard.gradle
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,7 +4,6 @@ plugins {
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
 }
-apply from: 'and_res_guard.gradle'//压缩apk
 
 android {
     signingConfigs {
@@ -16,7 +15,6 @@ android {
         }
     }
     compileSdkVersion cfgs.compileSdkVersion
-    buildToolsVersion cfgs.buildToolsVersion
 
     defaultConfig {
         applicationId "com.zj.play"
@@ -50,6 +48,11 @@ android {
     buildFeatures {
         viewBinding true
     }
+
+    lintOptions {
+        disable "Instantiatable"
+    }
+
 }
 
 dependencies {
@@ -67,8 +70,8 @@ dependencies {
     //implementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
 
     // hilt
-    implementation 'com.google.dagger:hilt-android:2.40.5'
-    kapt 'com.google.dagger:hilt-android-compiler:2.40.5'
+    implementation "com.google.dagger:hilt-android:$hilt_version"
+    kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
     implementation 'androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03'
     kapt 'androidx.hilt:hilt-compiler:1.0.0'
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -63,6 +63,7 @@
         <activity
             android:name=".WelcomeActivity"
             android:configChanges="keyboardHidden|keyboard|screenSize|locale|navigation|smallestScreenSize"
+            android:exported="true"
             android:theme="@style/AppTheme.NoActionBars">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -74,6 +75,7 @@
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
         </activity>
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.zj.play.fileprovider"
diff --git a/build.gradle b/build.gradle
@@ -4,19 +4,18 @@ apply from: "config.gradle"
 buildscript {
     ext {
         kotlin_version = '1.6.0'
+        hilt_version = '2.40.5'
     }
     repositories {
         google()
         mavenCentral()
         maven { url 'https://maven.aliyun.com/repository/jcenter' }
-        maven { url "https://s01.oss.sonatype.org/content/groups/public" }
         maven { url 'https://jitpack.io' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.2.20'
-        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.36'
+        classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -27,7 +26,6 @@ allprojects {
         google()
         mavenCentral()
         maven { url 'https://maven.aliyun.com/repository/jcenter' }
-        maven { url "https://s01.oss.sonatype.org/content/groups/public" }
         maven { url 'https://jitpack.io' }
     }
 }
diff --git a/config.gradle b/config.gradle
@@ -1,11 +1,11 @@
 ext {
     cfgs = [
-            compileSdkVersion        : 30,
-            buildToolsVersion        : "30.0.2",
+            compileSdkVersion        : 31,
+            buildToolsVersion        : "31.0.3",
             minSdkVersion            : 23,
-            targetSdkVersion         : 30,
-            versionCode              : 19,
-            versionName              : "3.2.0",
+            targetSdkVersion         : 31,
+            versionCode              : 20,
+            versionName              : "4.0.0",
             testInstrumentationRunner: "androidx.test.runner.AndroidJUnitRunner",
             consumerProguardFiles    : 'consumer-rules.pro',
     ]
diff --git a/core/build.gradle b/core/build.gradle
@@ -13,7 +13,6 @@ android {
         }
     }
     compileSdkVersion cfgs.compileSdkVersion
-    buildToolsVersion cfgs.buildToolsVersion
 
     defaultConfig {
         minSdkVersion cfgs.minSdkVersion
diff --git a/floating/build.gradle b/floating/build.gradle
@@ -13,7 +13,6 @@ android {
         }
     }
     compileSdkVersion cfgs.compileSdkVersion
-    buildToolsVersion cfgs.buildToolsVersion
 
     defaultConfig {
         minSdkVersion cfgs.minSdkVersion
diff --git a/model/build.gradle b/model/build.gradle
@@ -14,7 +14,6 @@ android {
         }
     }
     compileSdkVersion cfgs.compileSdkVersion
-    buildToolsVersion cfgs.buildToolsVersion
 
     defaultConfig {
         minSdkVersion cfgs.minSdkVersion
@@ -55,7 +54,7 @@ dependencies {
     implementation des.appcompat
     implementation project(path: ':core')
 
-    def room_version = "2.3.0"
+    def room_version = "2.4.0-rc01"
     api "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
     // For Kotlin use kapt instead of annotationProcessor
diff --git a/network/build.gradle b/network/build.gradle
@@ -13,7 +13,6 @@ android {
         }
     }
     compileSdkVersion cfgs.compileSdkVersion
-    buildToolsVersion cfgs.buildToolsVersion
 
     defaultConfig {
         minSdkVersion cfgs.minSdkVersion
diff --git a/permisson/build.gradle b/permisson/build.gradle
@@ -13,7 +13,6 @@ android {
         }
     }
     compileSdkVersion cfgs.compileSdkVersion
-    buildToolsVersion cfgs.buildToolsVersion
 
     defaultConfig {
         minSdkVersion cfgs.minSdkVersion

Original file line number	Diff line number	Diff line change
`@@ -4,19 +4,18 @@ apply from: "config.gradle"`
`4`	`4`	`buildscript {`
`5`	`5`	`ext {`
`6`	`6`	`kotlin_version = '1.6.0'`
	`7`	`+ hilt_version = '2.40.5'`
`7`	`8`	`}`
`8`	`9`	`repositories {`
`9`	`10`	`google()`
`10`	`11`	`mavenCentral()`
`11`	`12`	`maven { url 'https://maven.aliyun.com/repository/jcenter' }`
`12`		`- maven { url "https://s01.oss.sonatype.org/content/groups/public" }`
`13`	`13`	`maven { url 'https://jitpack.io' }`
`14`	`14`	`}`
`15`	`15`	`dependencies {`
`16`	`16`	`classpath 'com.android.tools.build:gradle:7.0.3'`
`17`	`17`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`18`		`- classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.2.20'`
`19`		`- classpath 'com.google.dagger:hilt-android-gradle-plugin:2.36'`
	`18`	`+ classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"`
`20`	`19`	`// NOTE: Do not place your application dependencies here; they belong`
`21`	`20`	`// in the individual module build.gradle files`
`22`	`21`	`}`
`@@ -27,7 +26,6 @@ allprojects {`
`27`	`26`	`google()`
`28`	`27`	`mavenCentral()`
`29`	`28`	`maven { url 'https://maven.aliyun.com/repository/jcenter' }`
`30`		`- maven { url "https://s01.oss.sonatype.org/content/groups/public" }`
`31`	`29`	`maven { url 'https://jitpack.io' }`
`32`	`30`	`}`
`33`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ android {`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`	`compileSdkVersion cfgs.compileSdkVersion`
`16`		`- buildToolsVersion cfgs.buildToolsVersion`
`17`	`16`
`18`	`17`	`defaultConfig {`
`19`	`18`	`minSdkVersion cfgs.minSdkVersion`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ android {`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`compileSdkVersion cfgs.compileSdkVersion`
`17`		`- buildToolsVersion cfgs.buildToolsVersion`
`18`	`17`
`19`	`18`	`defaultConfig {`
`20`	`19`	`minSdkVersion cfgs.minSdkVersion`
`@@ -55,7 +54,7 @@ dependencies {`
`55`	`54`	`implementation des.appcompat`
`56`	`55`	`implementation project(path: ':core')`
`57`	`56`
`58`		`- def room_version = "2.3.0"`
	`57`	`+ def room_version = "2.4.0-rc01"`
`59`	`58`	`api "androidx.room:room-runtime:$room_version"`
`60`	`59`	`kapt "androidx.room:room-compiler:$room_version"`
`61`	`60`	`// For Kotlin use kapt instead of annotationProcessor`