Switch to AndroidX, resolves #8

afollestad · Sep 16, 2018 · 29ab817 · 29ab817
1 parent 96d5de4
commit 29ab817
Show file tree

Hide file tree

Showing 14 changed files with 62 additions and 54 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,20 +1,22 @@
 ext.versions = [
-    minSdk            : 14,
-    compileSdk        : 28,
-    buildTools        : '28.0.1',
-    publishVersion    : '2.0.0',
-    publishVersionCode: 12,
+    minSdk             : 14,
+    compileSdk         : 28,
+    buildTools         : '28.0.1',
+    publishVersion     : '2.0.0',
+    publishVersionCode : 12,
 
-    gradlePlugin      : '3.1.4',
-    spotlessPlugin    : '3.14.0',
-    versionPlugin     : '0.20.0',
-    kotlin            : '1.2.70',
-    bintrayPlugin     : '0.8.1',
+    gradlePlugin       : '3.1.4',
+    spotlessPlugin     : '3.14.0',
+    versionPlugin      : '0.20.0',
+    kotlin             : '1.2.70',
+    bintrayPlugin      : '0.8.1',
 
-    junit             : '4.12',
-    testRunner        : '1.0.2',
-    espresso          : '3.0.2',
-    uiAutomator       : '2.1.3',
+    junit              : '4.12',
+    testRunner         : '1.0.2',
+    uiAutomator        : '2.1.3',
 
-    supportLib        : '28.0.0-rc02'
+    androidx           : '1.0.0-rc02',
+    androidxTest       : '1.1.0-alpha4',
+    androidxEspresso   : '3.1.0-alpha4',
+    androidxUiAutomator: '2.2.0-alpha1'
 ]
diff --git a/library/build.gradle b/library/build.gradle
@@ -18,8 +18,8 @@ android {
 }
 
 dependencies {
-  implementation 'com.android.support:support-annotations:' + versions.supportLib
-  implementation 'com.android.support:appcompat-v7:' + versions.supportLib
+  implementation 'androidx.annotation:annotation:' + versions.androidx
+  implementation 'androidx.appcompat:appcompat:' + versions.androidx
   implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:' + versions.kotlin
 }
 

diff --git a/library/src/main/java/com/afollestad/assent/AssentInContext.kt b/library/src/main/java/com/afollestad/assent/AssentInContext.kt
@@ -7,7 +7,8 @@ package com.afollestad.assent
 
 import android.content.Context
 import android.content.pm.PackageManager.PERMISSION_GRANTED
-import android.support.v4.content.ContextCompat
+import androidx.annotation.CheckResult
+import androidx.core.content.ContextCompat.checkSelfPermission
 import com.afollestad.assent.internal.Data.Companion.LOCK
 import com.afollestad.assent.internal.Data.Companion.assureFragment
 import com.afollestad.assent.internal.Data.Companion.get
@@ -17,9 +18,9 @@ import com.afollestad.assent.internal.equalsPermissions
 typealias Callback = (result: AssentResult) -> Unit
 typealias RunMe = (Unit) -> Unit
 
-fun Context.isAllGranted(vararg permissions: Permission): Boolean {
+@CheckResult fun Context.isAllGranted(vararg permissions: Permission): Boolean {
   for (perm in permissions) {
-    val granted = ContextCompat.checkSelfPermission(
+    val granted = checkSelfPermission(
         this, perm.value
     ) == PERMISSION_GRANTED
     if (!granted) return false

diff --git a/library/src/main/java/com/afollestad/assent/AssentInFragment.kt b/library/src/main/java/com/afollestad/assent/AssentInFragment.kt
@@ -5,14 +5,15 @@
  */
 package com.afollestad.assent
 
-import android.support.v4.app.Fragment
+import androidx.annotation.CheckResult
+import androidx.fragment.app.Fragment
 import com.afollestad.assent.internal.Data.Companion.LOCK
 import com.afollestad.assent.internal.Data.Companion.assureFragment
 import com.afollestad.assent.internal.Data.Companion.get
 import com.afollestad.assent.internal.PendingRequest
 import com.afollestad.assent.internal.equalsPermissions
 
-fun Fragment.isAllGranted(vararg permissions: Permission) =
+@CheckResult fun Fragment.isAllGranted(vararg permissions: Permission) =
   activity?.isAllGranted(*permissions) ?: throw IllegalStateException(
       "Fragment's Activity is null."
   )

diff --git a/library/src/main/java/com/afollestad/assent/AssentResult.kt b/library/src/main/java/com/afollestad/assent/AssentResult.kt
@@ -9,6 +9,7 @@ package com.afollestad.assent
 
 import android.content.pm.PackageManager.PERMISSION_DENIED
 import android.content.pm.PackageManager.PERMISSION_GRANTED
+import androidx.annotation.CheckResult
 import com.afollestad.assent.internal.containsPermission
 
 /**
@@ -28,10 +29,10 @@ class AssentResult(
   }
 
   /** Returns true if this result contains the given permission. */
-  fun containsPermissions(permission: Permission) =
+  @CheckResult fun containsPermissions(permission: Permission) =
     this.permissions.containsPermission(permission)
 
-  fun isAllGranted(permissions: List<Permission>): Boolean {
+  @CheckResult fun isAllGranted(permissions: List<Permission>): Boolean {
     for (perm in permissions) {
       val index = this.permissions.indexOfFirst { it.value == perm.value }
       if (index == -1) {
@@ -46,10 +47,10 @@ class AssentResult(
   }
 
   /** Returns true if all permissions in the given array have been granted. */
-  fun isAllGranted(vararg permissions: Permission) = isAllGranted(permissions.toList())
+  @CheckResult fun isAllGranted(vararg permissions: Permission) = isAllGranted(permissions.toList())
 
   /** Returns true if all permissions in the given array have been denied. */
-  fun isAllDenied(vararg permissions: Permission): Boolean {
+  @CheckResult fun isAllDenied(vararg permissions: Permission): Boolean {
     for (perm in permissions) {
       val index = this.permissions.indexOfFirst { it.value == perm.value }
       if (index == -1) {

diff --git a/library/src/main/java/com/afollestad/assent/internal/Data.kt b/library/src/main/java/com/afollestad/assent/internal/Data.kt
@@ -6,8 +6,8 @@
 package com.afollestad.assent.internal
 
 import android.content.Context
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentActivity
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 
 internal class Data {
 

diff --git a/library/src/main/java/com/afollestad/assent/internal/Extensions.kt b/library/src/main/java/com/afollestad/assent/internal/Extensions.kt
@@ -5,9 +5,9 @@
  */
 package com.afollestad.assent.internal
 
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentActivity
-import android.support.v4.app.FragmentTransaction
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.FragmentTransaction
 import com.afollestad.assent.AssentResult
 import com.afollestad.assent.Callback
 import com.afollestad.assent.Permission

diff --git a/library/src/main/java/com/afollestad/assent/internal/PermissionFragment.kt b/library/src/main/java/com/afollestad/assent/internal/PermissionFragment.kt
@@ -5,8 +5,8 @@
  */
 package com.afollestad.assent.internal
 
-import android.support.v4.app.Fragment
 import android.util.Log
+import androidx.fragment.app.Fragment
 import com.afollestad.assent.AssentResult
 import com.afollestad.assent.internal.Data.Companion.assureFragment
 import com.afollestad.assent.internal.Data.Companion.forgetFragment

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -2,6 +2,7 @@ apply from: '../dependencies.gradle'
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: "com.github.ben-manes.versions"
 
 android {
   compileSdkVersion versions.compileSdk
@@ -19,18 +20,18 @@ android {
     versionCode versions.publishVersionCode
     versionName versions.publishVersion
 
-    testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
+    testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
   }
 }
 
 dependencies {
   implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:' + versions.kotlin
-  implementation 'com.android.support:appcompat-v7:' + versions.supportLib
+  implementation 'androidx.appcompat:appcompat:' + versions.androidx
   implementation project(':library')
 
   androidTestImplementation 'junit:junit:' + versions.junit
-  androidTestImplementation 'com.android.support.test.espresso:espresso-core:' + versions.espresso
-  androidTestImplementation 'com.android.support.test:runner:' + versions.testRunner
-  androidTestImplementation 'com.android.support.test:rules:' + versions.testRunner
-  androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:' + versions.uiAutomator
+  androidTestImplementation 'androidx.test:runner:' + versions.androidxTest
+  androidTestImplementation 'androidx.test:rules:' + versions.androidxTest
+  androidTestImplementation 'androidx.test.espresso:espresso-core:' + versions.androidxEspresso
+  androidTestImplementation 'androidx.test.uiautomator:uiautomator-v18:' + versions.androidxUiAutomator
 }
diff --git a/sample/src/androidTest/AndroidManifest.xml b/sample/src/androidTest/AndroidManifest.xml
@@ -2,5 +2,5 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.afollestad.assentsample">
 
-  <uses-sdk tools:overrideLibrary="android.support.test.uiautomator.v18"/>
+  <uses-sdk tools:overrideLibrary="android_libs.ub_uiautomator"/>
 </manifest>
diff --git a/sample/src/androidTest/java/com/afollestad/assentsample/AssentTest.kt b/sample/src/androidTest/java/com/afollestad/assentsample/AssentTest.kt
@@ -1,16 +1,16 @@
 package com.afollestad.assentsample
 
-import android.support.test.InstrumentationRegistry.getInstrumentation
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.espresso.matcher.ViewMatchers.withText
-import android.support.test.filters.SdkSuppress
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
-import android.support.test.uiautomator.UiDevice
+import androidx.test.InstrumentationRegistry.getInstrumentation
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.filters.SdkSuppress
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import androidx.test.uiautomator.UiDevice
 import com.afollestad.assentsample.utils.TEXT_ALLOW
 import com.afollestad.assentsample.utils.allowCurrentPermission
 import com.afollestad.assentsample.utils.assertViewWithTextIsVisible

diff --git a/sample/src/androidTest/java/com/afollestad/assentsample/utils/TestUtil.kt b/sample/src/androidTest/java/com/afollestad/assentsample/utils/TestUtil.kt
@@ -2,8 +2,8 @@ package com.afollestad.assentsample.utils
 
 import android.app.Activity
 import android.os.Handler
-import android.support.test.uiautomator.UiDevice
-import android.support.test.uiautomator.UiSelector
+import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiSelector
 
 internal const val TEXT_ALLOW = "ALLOW"
 internal const val TEXT_DENY = "DENY"

diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.afollestad.assentsample">
 
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -9,7 +10,8 @@
       android:icon="@mipmap/ic_launcher"
       android:label="@string/app_name"
       android:supportsRtl="true"
-      android:theme="@style/AppTheme">
+      android:theme="@style/AppTheme"
+      tools:ignore="AllowBackup,GoogleAppIndexingWarning">
 
     <activity
         android:name=".MainActivity"

diff --git a/sample/src/main/java/com/afollestad/assentsample/MainActivity.kt b/sample/src/main/java/com/afollestad/assentsample/MainActivity.kt
@@ -7,7 +7,7 @@
 package com.afollestad.assentsample
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import com.afollestad.assent.Permission.CALL_PHONE
 import com.afollestad.assent.Permission.WRITE_EXTERNAL_STORAGE
 import com.afollestad.assent.askForPermissions