diff --git a/README.md b/README.md index 1e06dd4..b834b92 100644 --- a/README.md +++ b/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' } } diff --git a/build.gradle b/build.gradle index 0f0ae37..8bb01f1 100644 --- a/build.gradle +++ b/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' } diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle index cd8a2c6..ea2ffd2 100644 --- a/gradle-plugin/build.gradle +++ b/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") 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 index 8db4d47..0e7bffc 100644 --- a/gradle-plugin/src/main/java/io/michaelrocks/paranoid/plugin/ParanoidTransform.kt +++ b/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 ) } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c44b679..f6b961f 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3f0f9be..e6a3091 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/processor/build.gradle b/processor/build.gradle index 6045d0d..45525b7 100644 --- a/processor/build.gradle +++ b/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 { diff --git a/processor/src/main/kotlin/io/michaelrocks/paranoid/processor/Patcher.kt b/processor/src/main/kotlin/io/michaelrocks/paranoid/processor/Patcher.kt index 384497c..24a0d05 100644 --- a/processor/src/main/kotlin/io/michaelrocks/paranoid/processor/Patcher.kt +++ b/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) }