diff --git a/.gitignore b/.gitignore index 04a5d46..aa724b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,15 @@ *.iml -*.apk -*.DS_Store - -/.idea -/.gradle -/build -/gradle -/gradlew -/gradlew.bat +.gradle /local.properties -/library/build -/sample/build \ No newline at end of file +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..9a340cb --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,24 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..c83a369 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..0380d8d --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..19aa6a5 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index bb6db48..8bdbdd5 100644 --- a/build.gradle +++ b/build.gradle @@ -28,29 +28,29 @@ buildscript { ext { var = [ - compileSdk: 28, + compileSdk: 30, minSdk : 14, - targetSdk : 28, - version : "3.0.2" + targetSdk : 30, + version : "4.0.0" ] } repositories { - jcenter() - maven { url "https://maven.google.com" } google() + jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' - classpath 'guru.stefma.bintrayrelease:bintrayrelease:1.0.0' + classpath "com.android.tools.build:gradle:4.1.2" } } allprojects { repositories { + google() jcenter() - maven { url "https://maven.google.com" } + mavenCentral() } } diff --git a/gradle.properties b/gradle.properties index 1d3591c..98bed16 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,21 @@ # Project-wide Gradle settings. - # IDE (e.g. Android Studio) users: # Gradle settings configured through the IDE *will override* # any settings specified in this file. - # For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html - # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +# 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 +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f6b961f Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..9c13142 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Feb 08 13:20:55 CET 2021 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip diff --git a/library/.gitignore b/library/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/library/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index fe30aa5..c91faf8 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -23,7 +23,6 @@ */ apply plugin: 'com.android.library' -apply plugin: "guru.stefma.bintrayrelease" android { @@ -51,14 +50,5 @@ android { dependencies { implementation 'androidx.legacy:legacy-support-v13:1.0.0' - implementation 'androidx.fragment:fragment:1.0.0' + implementation 'androidx.fragment:fragment:1.2.5' } - -version = '3.0.2' -group = 'rebus' -publish { - userOrg = 'raphaelbussa' - artifactId = 'permission-utils' - desc = 'Check marshmallow permission easily' - website = 'https://rebus007.github.io/PermissionUtils/' -} \ No newline at end of file diff --git a/sample/.gitignore b/sample/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/sample/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/sample/build.gradle b/sample/build.gradle index 1951f19..bc331c5 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -29,7 +29,7 @@ android { compileSdkVersion var.compileSdk defaultConfig { - applicationId "rebus.permissionutils.sample" + applicationId "com.raphaelbussa.permissionutils.sample" minSdkVersion var.minSdk targetSdkVersion var.targetSdk versionCode 1