gradle 3.5.0

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         //classpath 'me.tatarka:gradle-retrolambda:3.2.5'
     }
 }

gradle/wrapper/gradle-wrapper.properties

-#Mon Apr 29 12:47:40 CST 2019
+#Sat Aug 24 21:01:04 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

libcore/src/main/AndroidManifest.xml

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="cn.garymb.ygomobile.lib">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="cn.garymb.ygomobile.lib">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -17,7 +18,8 @@
             android:screenOrientation="sensorLandscape"
             android:taskAffinity="cn.garymb.ygomobile.game"
             android:theme="@android:style/Theme.Holo.NoActionBar.Fullscreen"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustPan"
+            tools:targetApi="honeycomb">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="YGOMobile"/>

mobile/src/main/AndroidManifest.xml

@@ -3,29 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="cn.garymb.ygomobile.lite">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission
-        android:name="android.permission.READ_LOGS"
-        tools:ignore="ProtectedPermissions" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission
-        android:name="android.permission.WRITE_SETTINGS"
-        tools:ignore="ProtectedPermissions" />
-    <uses-permission android:name="android.permission.GET_TASKS" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-
-    <uses-sdk tools:overrideLibrary="com.toptoche.searchablespinnerlibrary" />
     <application
         android:name="cn.garymb.ygomobile.App"
         android:allowBackup="false"
@@ -36,7 +13,8 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
 
-        tools:replace="android:allowBackup,android:supportsRtl">
+        tools:replace="android:allowBackup,android:supportsRtl"
+        tools:targetApi="m">
         <activity
             android:name="cn.garymb.ygomobile.ui.activities.LogoActivity"
             android:excludeFromRecents="false"
@@ -188,41 +166,55 @@
         <activity android:name="cn.garymb.ygomobile.ui.activities.FileLogActivity" />
         <activity android:name="cn.garymb.ygomobile.ui.activities.PermissionsActivity" />
 
-        <service
-            android:name="cn.garymb.ygomobile.ui.plus.ServiceDuelAssistant"
-            android:priority="1000" />
-
-        <!-- 为防止Service被系统回收，可以尝试通过提高服务的优先级解决，1000是最高优先级，数字越小，优先级越低 -->
-        <!--android:priority="1000"-->
         <activity
             android:name="com.base.bj.paysdk.TrPayAcitivity"
             android:configChanges="orientation|keyboardHidden|navigation|screenSize"
             android:exported="true"
             android:launchMode="singleTask"
             android:screenOrientation="behind"
-            android:windowSoftInputMode="adjustResize|stateHidden"></activity>
+            android:windowSoftInputMode="adjustResize|stateHidden" />
         <activity
             android:name="com.base.bj.paysdk.TrPayUnionAcitivity"
             android:configChanges="orientation|keyboardHidden|navigation|screenSize"
             android:exported="true"
-            android:windowSoftInputMode="adjustResize|stateHidden"></activity>
+            android:windowSoftInputMode="adjustResize|stateHidden" />
         <activity
             android:name="com.base.bj.paysdk.TrSelectListActivity"
             android:configChanges="orientation|keyboardHidden|navigation|screenSize"
             android:exported="true"
-            android:windowSoftInputMode="adjustResize|stateHidden"></activity>
-
+            android:windowSoftInputMode="adjustResize|stateHidden" />
         <meta-data
             android:name="PGYER_APPID"
-            android:value="${PGYER_APPID}"></meta-data>
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fallenstardust"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
+            android:value="${PGYER_APPID}" />
+        <!-- 为防止Service被系统回收，可以尝试通过提高服务的优先级解决，1000是最高优先级，数字越小，优先级越低 -->
+        <!--android:priority="1000"-->
+        <service
+            android:name="cn.garymb.ygomobile.ui.plus.ServiceDuelAssistant"
+            android:priority="1000" />
     </application>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission
+        android:name="android.permission.READ_LOGS"
+        tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission
+        android:name="android.permission.WRITE_SETTINGS"
+        tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
+    <uses-sdk tools:overrideLibrary="com.toptoche.searchablespinnerlibrary" />
 </manifest>
\ No newline at end of file

mobile/src/main/res/xml/file_paths.xml

-<?xml version="1.0" encoding="utf-8"?>
-<paths>
-    <files-path
-        name="fallenstardust"
-        path="." />
-    <cache-path
-        name="keyoyu"
-        path="." />
-    <external-cache-path
-        name="feihuaduo"
-        path="." />
-    <external-files-path
-        name="mercury"
-        path="." />
-    <external-path
-        name="garymb"
-        path="." />
-</paths>
\ No newline at end of file