diff --git a/app/build.gradle b/app/build.gradle index 7fbef72..b5afaef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 29 - buildToolsVersion "29.0.0" + compileSdkVersion 28 + buildToolsVersion "28.0.0" defaultConfig { applicationId "com.jjj.permission.utils" minSdkVersion 15 - targetSdkVersion 29 + targetSdkVersion 28 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -25,11 +25,9 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' // implementation project(path: ':permission') implementation 'com.github.jjjSilence:PermissionUtils:1.0.0' } \ No newline at end of file diff --git a/app/src/main/java/com/jjj/permission/utils/MainActivity.java b/app/src/main/java/com/jjj/permission/utils/MainActivity.java index 1c436e1..23c3681 100644 --- a/app/src/main/java/com/jjj/permission/utils/MainActivity.java +++ b/app/src/main/java/com/jjj/permission/utils/MainActivity.java @@ -2,13 +2,13 @@ import android.Manifest; import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.v7.app.AppCompatActivity; import com.jjj.permission.PermissionCallback; import com.jjj.permission.PermissionUtils; import com.jjj.permissionutils.R; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; public class MainActivity extends AppCompatActivity { private static String[] NEEDED_PERMISSIONS = new String[]{ diff --git a/gradle.properties b/gradle.properties index 199d16e..899c3fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ org.gradle.jvmargs=-Xmx1536m # AndroidX package structure to make it clearer which packages are bundled with the # Android operating system, and which are packaged with your app's APK # https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true +#android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX -android.enableJetifier=true +#android.enableJetifier=true diff --git a/permission/build.gradle b/permission/build.gradle index 85e82e5..f699a13 100644 --- a/permission/build.gradle +++ b/permission/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'com.github.dcendents.android-maven' group = 'com.github.jjjSilence' android { - compileSdkVersion 29 - buildToolsVersion "29.0.0" + compileSdkVersion 28 + buildToolsVersion "28.0.0" defaultConfig { minSdkVersion 15 - targetSdkVersion 29 + targetSdkVersion 28 versionCode 1 versionName "1.0" @@ -27,8 +27,6 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.android.support:appcompat-v7:28.0.0' testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' } \ No newline at end of file diff --git a/permission/src/main/java/com/jjj/permission/PermissionUtils.java b/permission/src/main/java/com/jjj/permission/PermissionUtils.java index c483757..d1df9fa 100644 --- a/permission/src/main/java/com/jjj/permission/PermissionUtils.java +++ b/permission/src/main/java/com/jjj/permission/PermissionUtils.java @@ -6,9 +6,8 @@ import android.content.DialogInterface; import android.content.pm.PackageManager; import android.graphics.Color; - -import androidx.core.app.ActivityCompat; -import androidx.core.content.ContextCompat; +import android.support.v4.app.ActivityCompat; +import android.support.v4.content.ContextCompat; /**