Merge branch 'hotfix/0.1.7'

MichaelRocks · Oct 26, 2017 · 4714c21 · 4714c21
2 parents 90e72dd + db7a8c3
commit 4714c21
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,8 @@ android:
     - tools
     - tools
     - platform-tools
-    - build-tools-26.0.2
-    - android-26
+    - build-tools-27.0.0
+    - android-27
 
 jdk:
   - oraclejdk8

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'io.michaelrocks:paranoid-gradle-plugin:0.1.6'
+    classpath 'io.michaelrocks:paranoid-gradle-plugin:0.1.7'
   }
 }
 

diff --git a/build.gradle b/build.gradle
@@ -4,15 +4,15 @@ allprojects {
   buildscript {
     repositories {
       mavenLocal()
-      jcenter()
       google()
+      jcenter()
     }
   }
 
   repositories {
     mavenLocal()
-    jcenter()
     google()
+    jcenter()
   }
 }
 
@@ -38,6 +38,6 @@ ext {
 
   junitVersion = '4.12'
 
-  androidToolsVersion = '3.0.0-rc1'
-  supportVersion = '26.1.0'
+  androidToolsVersion = '3.0.0'
+  supportVersion = '27.0.0'
 }
diff --git a/gradle-plugin/src/main/java/io/michaelrocks/paranoid/plugin/ParanoidTransform.kt b/gradle-plugin/src/main/java/io/michaelrocks/paranoid/plugin/ParanoidTransform.kt
@@ -81,6 +81,7 @@ class ParanoidTransform(private val android: BaseExtension) : Transform() {
       return EnumSet.of(
           QualifiedContent.Scope.PROJECT,
           QualifiedContent.Scope.SUB_PROJECTS,
+          QualifiedContent.Scope.EXTERNAL_LIBRARIES,
           QualifiedContent.Scope.PROVIDED_ONLY
       )
     } else {

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -10,13 +10,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'io.michaelrocks.paranoid'
 
 android {
-  compileSdkVersion 26
-  buildToolsVersion "26.0.2"
+  compileSdkVersion 27
+  buildToolsVersion "27.0.0"
 
   defaultConfig {
     applicationId "io.michaelrocks.paranoid.sample"
     minSdkVersion 16
-    targetSdkVersion 26
+    targetSdkVersion 27
     versionCode 1
     versionName "1.0"
   }

diff --git a/version.properties b/version.properties
@@ -1,6 +1,6 @@
 version.major=0
 version.minor=1
-version.patch=6
+version.patch=7
 version.snapshot=false
 
 version.dryRun=false
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ buildscript { @@
       }
       dependencies {
-        classpath 'io.michaelrocks:paranoid-gradle-plugin:0.1.6'
+        classpath 'io.michaelrocks:paranoid-gradle-plugin:0.1.7'
       }
     }
@@ Expand Down @@