Merge branch 'hotfix/0.2.1'

README.md

@@ -18,7 +18,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'io.michaelrocks:paranoid-gradle-plugin:0.1.8'
+    classpath 'io.michaelrocks:paranoid-gradle-plugin:0.2.1'
   }
 }
 

build.gradle

@@ -1,18 +1,21 @@
 allprojects {
-  ext.kotlinVersion = '1.2.31'
-  ext.pabloVersion = '1.0.0'
+  group = 'io.michaelrocks'
+  version = '0.2.1'
+
+  ext.kotlinVersion = '1.2.41'
+  ext.pabloVersion = '1.0.1'
 
-  ext.asmVersion = '6.0'
-  ext.gripVersion = '0.6.0-beta'
+  ext.asmVersion = '6.1.1'
+  ext.gripVersion = '0.6.2-beta'
   ext.logbackVersion = '1.2.3'
 
   ext.junitVersion = '4.12'
 
-  ext.androidToolsVersion = '3.1.1'
-  ext.supportVersion = '27.1.0'
+  ext.androidToolsVersion = '3.1.2'
+  ext.supportVersion = '27.1.1'
 
-  ext.runnerVersion = '1.0.1'
-  ext.espressoVersion = '3.0.1'
+  ext.runnerVersion = '1.0.2'
+  ext.espressoVersion = '3.0.2'
 
   buildscript {
     repositories {
@@ -32,7 +35,4 @@ allprojects {
     google()
     jcenter()
   }
-
-  group = 'io.michaelrocks'
-  version = '0.2.0'
 }

gradle-plugin/build.gradle

@@ -12,7 +12,7 @@ dependencies {
 
   relocate project(':processor')
 
-  compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 }
 
 def generatedDir = new File(projectDir, "generated")

gradle-plugin/src/main/java/io/michaelrocks/paranoid/plugin/ParanoidTransform.kt

@@ -35,8 +35,8 @@ class ParanoidTransform(private val android: BaseExtension) : Transform() {
       val format = if (input is JarInput) Format.JAR else Format.DIRECTORY
       invocation.outputProvider.getContentLocation(
           input.name,
-          QualifiedContent.DefaultContentType.CLASSES,
-          QualifiedContent.Scope.PROJECT,
+          input.contentTypes,
+          input.scopes,
           format
       )
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

processor/build.gradle

@@ -5,15 +5,15 @@ sourceCompatibility = JavaVersion.VERSION_1_6
 targetCompatibility = JavaVersion.VERSION_1_6
 
 dependencies {
-  compile project(':core')
-  compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-  compile "ch.qos.logback:logback-classic:$logbackVersion"
+  implementation project(':core')
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+  implementation "ch.qos.logback:logback-classic:$logbackVersion"
 
   relocate "org.ow2.asm:asm:$asmVersion"
   relocate "org.ow2.asm:asm-commons:$asmVersion"
   relocate "io.michaelrocks:grip:$gripVersion"
 
-  testCompile "junit:junit:$junitVersion"
+  testImplementation "junit:junit:$junitVersion"
 }
 
 jar {

processor/src/main/kotlin/io/michaelrocks/paranoid/processor/Patcher.kt

@@ -84,7 +84,7 @@ class Patcher(
     logger.debug("  Source: {}", sourceFile)
     logger.debug("  Target: {}", targetFile)
     val reader = ClassReader(sourceFile.readBytes())
-    val writer = StandaloneClassWriter(reader, ClassWriter.COMPUTE_MAXS or ClassWriter.COMPUTE_FRAMES, classRegistry)
+    val writer = StandaloneClassWriter(ClassWriter.COMPUTE_MAXS or ClassWriter.COMPUTE_FRAMES, classRegistry)
     val patcher =
         writer
             .wrapIf(hasObfuscateAnnotation) { RemoveObfuscateClassPatcher(it) }