Google Play requires targetSdkVersion 28. network state API, Wi-Fi sc…

…an interval,FOREGROUND_SERVICE permission, cleartextTrafficPermitted, etc.
tateisu · Oct 11, 2019 · 6e562f1 · 6e562f1
1 parent 5989df9
commit 6e562f1
Show file tree

Hide file tree

Showing 45 changed files with 2,350 additions and 2,067 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/dictionaries/tateisu.xml b/.idea/dictionaries/tateisu.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,7 +13,7 @@ android {
         versionCode 24
         versionName "1.14.4"
         applicationId "jp.juggler.fadownloader"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -69,27 +69,29 @@ repositories {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    //noinspection GradleDependency
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testImplementation 'junit:junit:4.12'
 
     implementation project(':exif')
     implementation project(':billing')
 
-    //noinspection GradleDependency
-    implementation "com.android.support:appcompat-v7:$asl_version"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
 
-    implementation 'com.google.android.gms:play-services-ads:15.0.1'
-    implementation "com.google.android.gms:play-services-location:15.0.1"
+    implementation 'com.google.android.gms:play-services-ads:18.2.0'
+    implementation "com.google.android.gms:play-services-location:17.0.0"
 
-    implementation "com.google.firebase:firebase-core:16.0.3"
-    implementation "com.google.firebase:firebase-ads:15.0.1"
+    implementation "com.google.firebase:firebase-core:17.2.0"
+    implementation "com.google.firebase:firebase-ads:18.2.0"
 
-    implementation 'org.apache.commons:commons-lang3:3.3.2'
+    // https://commons.apache.org/proper/commons-lang/release-history.html
+    // Apache Commons Lang は 3.9から Java 8 を要求する
+    //noinspection GradleDependency
+    implementation 'org.apache.commons:commons-lang3:3.8.1'
     implementation 'commons-io:commons-io:2.6'
-    implementation 'com.neovisionaries:nv-websocket-client:2.5'
+    implementation 'com.neovisionaries:nv-websocket-client:2.9'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 

diff --git a/app/src/androidTest/java/jp/juggler/fadownloader/ExampleInstrumentedTest.kt b/app/src/androidTest/java/jp/juggler/fadownloader/ExampleInstrumentedTest.kt
@@ -1,7 +1,7 @@
 package jp.juggler.fadownloader
 
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="com.android.vending.BILLING"/>
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
     <application
         android:name="jp.juggler.fadownloader.App1"
@@ -24,8 +25,9 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:ignore="AllowBackup,GoogleAppIndexingWarning"
+        tools:ignore="AllowBackup,GoogleAppIndexingWarning,UnusedAttribute"
         android:fullBackupContent="@xml/backup_descriptor"
+        android:networkSecurityConfig="@xml/network_security_config"
         >
 
         <service
@@ -137,7 +139,7 @@
             />
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="jp.juggler.fadownloader.FileProvider"
             android:grantUriPermissions="true"
             android:exported="false">