Separate annotations to dedicated module.

BigCoach · May 19, 2018 · b638ba8 · b638ba8
1 parent f0f5519
commit b638ba8
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 7 deletions.
diff --git a/annotation/.gitignore b/annotation/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/annotation/build.gradle b/annotation/build.gradle
@@ -0,0 +1,4 @@
+apply plugin: 'java-library'
+
+targetCompatibility = JavaVersion.VERSION_1_6
+sourceCompatibility = JavaVersion.VERSION_1_6
diff --git a/...missions/dispatcher/GrantableRequest.java → ...missions/dispatcher/GrantableRequest.java b/...missions/dispatcher/GrantableRequest.java → ...missions/dispatcher/GrantableRequest.java
diff --git a/...rmissions/dispatcher/NeedsPermission.java → ...rmissions/dispatcher/NeedsPermission.java b/...rmissions/dispatcher/NeedsPermission.java → ...rmissions/dispatcher/NeedsPermission.java
diff --git a/...rmissions/dispatcher/OnNeverAskAgain.java → ...rmissions/dispatcher/OnNeverAskAgain.java b/...rmissions/dispatcher/OnNeverAskAgain.java → ...rmissions/dispatcher/OnNeverAskAgain.java
diff --git a/...ssions/dispatcher/OnPermissionDenied.java → ...ssions/dispatcher/OnPermissionDenied.java b/...ssions/dispatcher/OnPermissionDenied.java → ...ssions/dispatcher/OnPermissionDenied.java
diff --git a/...rmissions/dispatcher/OnShowRationale.java → ...rmissions/dispatcher/OnShowRationale.java b/...rmissions/dispatcher/OnShowRationale.java → ...rmissions/dispatcher/OnShowRationale.java
diff --git a/...issions/dispatcher/PermissionRequest.java → ...issions/dispatcher/PermissionRequest.java b/...issions/dispatcher/PermissionRequest.java → ...issions/dispatcher/PermissionRequest.java
diff --git a/...ssions/dispatcher/RuntimePermissions.java → ...ssions/dispatcher/RuntimePermissions.java b/...ssions/dispatcher/RuntimePermissions.java → ...ssions/dispatcher/RuntimePermissions.java
diff --git a/buildSrc/src/main/groovy/permissions/dispatcher/AndroidJarDependencyExtension.groovy b/buildSrc/src/main/groovy/permissions/dispatcher/AndroidJarDependencyExtension.groovy
@@ -3,7 +3,6 @@ package permissions.dispatcher
 import javax.annotation.Nullable
 
 class AndroidJarDependencyExtension {
-
     @Nullable
     String directory
 }
diff --git a/library/build.gradle b/library/build.gradle
@@ -22,7 +22,6 @@ android {
         main {
             java {
                 srcDirs = [
-                        'src/main/java',
                         'src/main/android'
                 ]
             }
@@ -43,6 +42,7 @@ dependencies {
     testImplementation "org.powermock:powermock-api-mockito:$POWERMOCK_VERSION"
     testImplementation "org.powermock:powermock-module-junit4:$POWERMOCK_VERSION"
 
+    api project(path: ':annotation')
     lintChecks project(path: ':lint', configuration: 'lintChecks')
 }
 

diff --git a/library/src/main/android/permissions/dispatcher/PermissionUtils.java b/library/src/main/android/permissions/dispatcher/PermissionUtils.java
@@ -9,10 +9,9 @@
 import android.support.v13.app.FragmentCompat;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.AppOpsManagerCompat;
+import android.support.v4.content.PermissionChecker;
 import android.support.v4.util.SimpleArrayMap;
 
-import static android.support.v4.content.PermissionChecker.checkSelfPermission;
-
 public final class PermissionUtils {
     // Map of dangerous permissions introduced in later framework versions.
     // Used to conditionally bypass permission-hold checks on older devices.
@@ -97,7 +96,7 @@ private static boolean hasSelfPermission(Context context, String permission) {
             return hasSelfPermissionForXiaomi(context, permission);
         }
         try {
-            return checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED;
+            return PermissionChecker.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED;
         } catch (RuntimeException t) {
             return false;
         }
@@ -110,7 +109,7 @@ private static boolean hasSelfPermissionForXiaomi(Context context, String permis
             return true;
         }
         int noteOp = AppOpsManagerCompat.noteOp(context, permissionToOp, Process.myUid(), context.getPackageName());
-        return noteOp == AppOpsManagerCompat.MODE_ALLOWED && checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED;
+        return noteOp == AppOpsManagerCompat.MODE_ALLOWED && PermissionChecker.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED;
     }
 
     /**

diff --git a/processor/build.gradle b/processor/build.gradle
@@ -30,6 +30,7 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
     compile "com.squareup:javapoet:$JAVAPOET_VERSION"
     compile "com.squareup:kotlinpoet:$KOTLINPOET_VERSION"
+    compile project(path: ':annotation')
 
     testCompile "junit:junit:$JUNIT_VERSION"
     testCompile "com.google.testing.compile:compile-testing:$COMPILE_TESTING_VERSION"

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':library', ':processor', ':sample', ':lint', ':sample-kotlin', ':test', ':test-v13'
+include ':library', ':processor', ':sample', ':lint', ':sample-kotlin', ':test', ':test-v13', ':annotation'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include ':library', ':processor', ':sample', ':lint', ':sample-kotlin', ':test', ':test-v13'
		include ':library', ':processor', ':sample', ':lint', ':sample-kotlin', ':test', ':test-v13', ':annotation'