Remove ignore from one kt unit test. (#578)

Author: hotchemi

processor/build.gradle

@@ -27,24 +27,27 @@ artifacts {
 }
 
 dependencies {
-    implementation "androidx.annotation:annotation:$ANDROIDX_LIBRARY_VERSION"
-
+    compile "androidx.annotation:annotation:$ANDROIDX_LIBRARY_VERSION"
     compile "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
     compile "com.squareup:javapoet:$JAVAPOET_VERSION"
     compile "com.squareup:kotlinpoet:$KOTLINPOET_VERSION"
     compile project(path: ':annotation')
 
+    testCompileAar "androidx.legacy:legacy-support-v4:$ANDROIDX_LIBRARY_VERSION"
+    testCompileAar "com.bluelinelabs:conductor:$CONDUCTOR_VERSION"
+    testCompileAar project(path: ":library", configuration: "default")
+
     testCompile androidJar()
     testCompile files(Jvm.current().getToolsJar())
     testCompile "junit:junit:$JUNIT_VERSION"
     testCompile "com.google.testing.compile:compile-testing:$COMPILE_TESTING_VERSION"
     testCompile "commons-io:commons-io:$COMMONS_IO_VERSION"
     testCompile "com.squareup.okio:okio:2.1.0"
+    // below lines are supposed to be as this order to obtain dependencies in KotlinCompilerCall.classpathFiles
+    testCompile "androidx.legacy:legacy-support-v4:$ANDROIDX_LIBRARY_VERSION"
+    testCompile "com.bluelinelabs:conductor:$CONDUCTOR_VERSION"
     testCompile "org.jetbrains.kotlin:kotlin-compiler-embeddable:$KOTLIN_COMPILER_LIB_VERSION"
     testCompile "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:$KOTLIN_COMPILER_LIB_VERSION"
-    testCompileAar "androidx.legacy:legacy-support-v4:$ANDROIDX_LIBRARY_VERSION"
-    testCompileAar "com.bluelinelabs:conductor:$CONDUCTOR_VERSION"
-    testCompileAar project(path: ":library", configuration: "default")
 }
 
 publishing {

processor/src/main/kotlin/permissions/dispatcher/processor/PermissionsProcessor.kt

@@ -69,6 +69,7 @@ class PermissionsProcessor : AbstractProcessor() {
     }
 
     private fun processKotlin(element: Element, rpe: RuntimePermissionsElement, requestCodeProvider: RequestCodeProvider) {
+        val processorUnit = findAndValidateProcessorUnit(kotlinProcessorUnits, element)
         // FIXME: weirdly under kaptKotlin files is not recognized as source file on AS or IntelliJ
         // so as a workaround we generate .kt file in generated/source/kapt/$sourceSetName
         // ref: https://github.com/hotchemi/PermissionsDispatcher/issues/320#issuecomment-316175775
@@ -77,13 +78,10 @@ class PermissionsProcessor : AbstractProcessor() {
                     processingEnv.messager.printMessage(Diagnostic.Kind.ERROR, "Can't find the target directory for generated Kotlin files.")
                     return
                 }
-
         val kaptGeneratedDir = File(kaptGeneratedDirPath)
         if (!kaptGeneratedDir.parentFile.exists()) {
             kaptGeneratedDir.parentFile.mkdirs()
         }
-
-        val processorUnit = findAndValidateProcessorUnit(kotlinProcessorUnits, element)
         val kotlinFile = processorUnit.createFile(rpe, requestCodeProvider)
         kotlinFile.writeTo(kaptGeneratedDir)
     }

processor/src/test/java/permissions/dispatcher/processor/KtProcessorTestSuite.kt

@@ -5,7 +5,6 @@ import org.intellij.lang.annotations.Language
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertThat
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TemporaryFolder
@@ -357,7 +356,6 @@ class KtProcessorTestSuite {
     }
 
     @Test
-    @Ignore("We should fix this validation for Kotlin")
     fun wrongAnnotatedClass() {
         val call = KotlinCompilerCall(temporaryFolder.root)
         call.addService(Processor::class, PermissionsProcessor::class)
@@ -371,9 +369,7 @@ class KtProcessorTestSuite {
 
         @RuntimePermissions
         class MyService: Service() {
-            override fun onBind(p0: Intent?): IBinder? {
-                TODO("not implemented")
-            }
+            override fun onBind(intent: Intent?): IBinder? = null
             @NeedsPermission(Manifest.permission.CAMERA)
             fun showCamera() {
             }

processor/src/test/java/permissions/dispatcher/processor/kotlin/KotlinCompilerCall.kt

@@ -4,6 +4,7 @@ import com.google.common.collect.LinkedHashMultimap
 import okio.Buffer
 import okio.buffer
 import okio.sink
+import org.apache.commons.io.FileUtils
 import org.jetbrains.kotlin.cli.common.CLITool
 import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
 import permissions.dispatcher.processor.KtProcessorTestSuite
@@ -14,19 +15,18 @@ import java.io.PrintStream
 import java.net.URLClassLoader
 import java.net.URLDecoder
 import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
 import java.util.zip.ZipOutputStream
 import kotlin.reflect.KClass
 
-/** Prepares an invocation of the Kotlin compiler. */
-class KotlinCompilerCall(var scratchDir: File) {
+class KotlinCompilerCall(private val scratchDir: File) {
     private val sourcesDir = File(scratchDir, "sources")
     private val classesDir = File(scratchDir, "classes")
     private val servicesJar = File(scratchDir, "services.jar")
     private val args = mutableListOf<String>()
     private val kaptArgs = mutableMapOf<String, String>()
     private val classpath = mutableListOf<String>()
     private val services = LinkedHashMultimap.create<KClass<*>, KClass<*>>()!!
-    private val inheritClasspath = true
 
     /** Adds a source file to be compiled. */
     fun addKt(path: String = "sources.kt", source: String) {
@@ -83,7 +83,6 @@ class KotlinCompilerCall(var scratchDir: File) {
     private fun annotationProcessorArgs(): List<String> {
         val kaptSourceDir = File(scratchDir, "kapt/sources")
         val kaptStubsDir = File(scratchDir, "kapt/stubs")
-
         return listOf(
                 "-Xplugin=${kapt3Jar()}",
                 "-P", "plugin:org.jetbrains.kotlin.kapt3:sources=$kaptSourceDir",
@@ -100,17 +99,13 @@ class KotlinCompilerCall(var scratchDir: File) {
         result.addAll(classpath)
 
         // Copy over the classpath of the running application.
-        if (inheritClasspath) {
-            for (classpathFile in classpathFiles()) {
-                result.add(classpathFile.toString())
-            }
+        for (classpathFile in classpathFiles()) {
+            result.add(classpathFile.toString())
         }
-
         if (!services.isEmpty) {
             writeServicesJar()
             result.add(servicesJar.toString())
         }
-
         return result.toList()
     }
 
@@ -145,7 +140,17 @@ class KotlinCompilerCall(var scratchDir: File) {
             if (url.protocol != "file") {
                 throw UnsupportedOperationException("unable to handle classpath element $url")
             }
-            result.add(File(URLDecoder.decode(url.path, "UTF-8")))
+            if (url.path.endsWith(".aar")) {
+                // extract jar file from aar and add it to classpath
+                val zipFile = ZipFile(url.path)
+                val sourceInputStream = zipFile.getInputStream(zipFile.getEntry("classes.jar"))
+                val newFileName = url.path.replace(".aar", ".jar")
+                val destinationFile = File(File(scratchDir, "unzippedAar"), newFileName)
+                FileUtils.copyInputStreamToFile(sourceInputStream, destinationFile)
+                result.add(destinationFile)
+            } else {
+                result.add(File(URLDecoder.decode(url.path, "UTF-8")))
+            }
         }
         return result.toList()
     }