Skip to content

Commit

Permalink
Down version
Browse files Browse the repository at this point in the history
  • Loading branch information
姜姣姣 committed Apr 13, 2020
1 parent fe8c741 commit 2843b8d
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 20 deletions.
12 changes: 5 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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'
}
4 changes: 2 additions & 2 deletions app/src/main/java/com/jjj/permission/utils/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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[]{
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

10 changes: 4 additions & 6 deletions permission/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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'
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;


/**
Expand Down

0 comments on commit 2843b8d

Please sign in to comment.