upgrade some libs version, fix permission problem

huzongyao · Nov 24, 2020 · 65e2917 · 65e2917
1 parent 4e1269b
commit 65e2917
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@
 .DS_Store
 /build
 /captures
+.cxx
diff --git a/appgbc/build.gradle b/appgbc/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     signingConfigs {
         demokey {
@@ -14,9 +14,9 @@ android {
     defaultConfig {
         applicationId "nostalgia.appgbc"
         minSdkVersion 15
-        targetSdkVersion 29
-        versionCode 1400
-        versionName "1.4.0"
+        targetSdkVersion 30
+        versionCode 1401
+        versionName "1.4.1"
         resConfigs "zh"
         ndk {
             abiFilters 'armeabi-v7a', 'x86', 'arm64-v8a'

diff --git a/appgg/build.gradle b/appgg/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     signingConfigs {
         demokey {
@@ -14,9 +14,9 @@ android {
     defaultConfig {
         applicationId "nostalgia.appgg"
         minSdkVersion 15
-        targetSdkVersion 29
-        versionCode 1400
-        versionName "1.4.0"
+        targetSdkVersion 30
+        versionCode 1401
+        versionName "1.4.1"
         resConfigs "zh"
         ndk {
             abiFilters 'armeabi-v7a', 'x86', 'arm64-v8a'

diff --git a/appnes/build.gradle b/appnes/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     signingConfigs {
         demokey {
@@ -14,9 +14,9 @@ android {
     defaultConfig {
         applicationId "nostalgia.appnes"
         minSdkVersion 15
-        targetSdkVersion 29
-        versionCode 1400
-        versionName "1.4.0"
+        targetSdkVersion 30
+        versionCode 1401
+        versionName "1.4.1"
         resConfigs "zh"
         ndk {
             abiFilters 'armeabi-v7a', 'x86', 'arm64-v8a'

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.6.2'
     }
 }
 

diff --git a/framework/build.gradle b/framework/build.gradle
@@ -20,7 +20,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    api 'androidx.appcompat:appcompat:1.1.0'
-    api 'com.google.android.material:material:1.0.0'
-    api 'com.blankj:utilcode:1.25.9'
+    api 'androidx.appcompat:appcompat:1.2.0'
+    api 'com.google.android.material:material:1.2.1'
+    api 'com.blankj:utilcode:1.26.0'
 }
diff --git a/framework/src/main/AndroidManifest.xml b/framework/src/main/AndroidManifest.xml
@@ -1,14 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="nostalgia.framework">
 
-    <uses-feature
-        android:glEsVersion="0x00020000"
-        android:required="false" />
-
-    <uses-feature
-        android:name="android.hardware.touchscreen"
-        android:required="false" />
-
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -22,7 +15,9 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:requestLegacyExternalStorage="true"
+        android:theme="@style/AppTheme"
+        tools:ignore="UnusedAttribute">
 
         <activity
             android:name=".ui.SplashActivity"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,4 @@ @@
     .DS_Store
     /build
     /captures
+    .cxx