From 3ccaae249a117de6492422d6d7b05a527cfda013 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 1 Jun 2018 01:35:05 +0300 Subject: [PATCH] Move Android test from `foo` to `com.example` package Otherwise the test `KotlinAndroid32GradleIT.testIncrementalCompile` failed with Android resource linking failed error: "attribute 'package' in tag is not a valid Android package name: 'foo'." --- .../gradle/AbstractKotlinAndroidGradleTests.kt | 10 +++++++--- .../app/build.gradle | 2 +- .../app/src/main/AndroidManifest.xml | 2 +- .../src/main/java/com/example/JavaActivity.java | 14 ++++++++++++++ .../app/src/main/java/foo/JavaActivity.java | 9 --------- .../src/main/kotlin/com/example/KotlinActivity1.kt | 13 +++++++++++++ .../src/main/kotlin/com/example/KotlinActivity2.kt | 10 ++++++++++ .../src/main/kotlin/com/example/getSomething.kt | 8 ++++++++ .../app/src/main/kotlin/foo/KotlinActivity1.kt | 8 -------- .../app/src/main/kotlin/foo/KotlinActivity2.kt | 5 ----- .../app/src/main/kotlin/foo/getSomething.kt | 3 --- 11 files changed, 54 insertions(+), 30 deletions(-) create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/java/com/example/JavaActivity.java delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/java/foo/JavaActivity.java create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/com/example/KotlinActivity1.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/com/example/KotlinActivity2.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/com/example/getSomething.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/foo/KotlinActivity1.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/foo/KotlinActivity2.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/foo/getSomething.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt index 2ad5266e00f..0062bcb094c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt @@ -206,7 +206,7 @@ abstract class AbstractKotlinAndroidGradleTests( val getSomethingKt = project.projectDir.walk().filter { it.isFile && it.name.endsWith("getSomething.kt") }.first() getSomethingKt.writeText( """ -package foo +package com.example fun getSomething() = 10 """ @@ -214,8 +214,12 @@ fun getSomething() = 10 project.build("assembleDebug", options = options) { assertSuccessful() - assertCompiledKotlinSources(listOf("app/src/main/kotlin/foo/KotlinActivity1.kt", "app/src/main/kotlin/foo/getSomething.kt")) - assertCompiledJavaSources(listOf("app/src/main/java/foo/JavaActivity.java"), weakTesting = true) + val affectedKotlinFiles = listOf( + "app/src/main/kotlin/com/example/KotlinActivity1.kt", + "app/src/main/kotlin/com/example/getSomething.kt" + ) + assertCompiledKotlinSources(affectedKotlinFiles) + assertCompiledJavaSources(listOf("app/src/main/java/com/example/JavaActivity.java"), weakTesting = true) } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/build.gradle index 21db1354e41..4c4f44117b4 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/build.gradle @@ -20,7 +20,7 @@ android { buildToolsVersion "25.0.2" defaultConfig { - applicationId "foo" + applicationId "com.example" minSdkVersion 14 targetSdkVersion 23 versionCode 1 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/AndroidManifest.xml index 071219494ca..eea9f24359c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/AndroidManifest.xml +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/java/com/example/JavaActivity.java b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/java/com/example/JavaActivity.java new file mode 100644 index 00000000000..c79135a331f --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/java/com/example/JavaActivity.java @@ -0,0 +1,14 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package com.example; + +import android.app.Activity; + +public class JavaActivity extends Activity { + void f() { + GetSomethingKt.getSomething(); + } +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/java/foo/JavaActivity.java b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/java/foo/JavaActivity.java deleted file mode 100644 index 1aab9880e25..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/java/foo/JavaActivity.java +++ /dev/null @@ -1,9 +0,0 @@ -package foo; - -import android.app.Activity; - -public class JavaActivity extends Activity { - void f() { - foo.GetSomethingKt.getSomething(); - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/com/example/KotlinActivity1.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/com/example/KotlinActivity1.kt new file mode 100644 index 00000000000..1848d16ea82 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/com/example/KotlinActivity1.kt @@ -0,0 +1,13 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package com.example + +import android.app.Activity + +open class KotlinActivity1 : Activity() { + val usage = getSomething() +} + diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/com/example/KotlinActivity2.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/com/example/KotlinActivity2.kt new file mode 100644 index 00000000000..2f4395dae39 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/com/example/KotlinActivity2.kt @@ -0,0 +1,10 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package com.example + +import android.app.Activity + +open class KotlinActivity2 : Activity() \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/com/example/getSomething.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/com/example/getSomething.kt new file mode 100644 index 00000000000..dd146c03e0a --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/com/example/getSomething.kt @@ -0,0 +1,8 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package com.example + +fun getSomething() = "Hello, world!" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/foo/KotlinActivity1.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/foo/KotlinActivity1.kt deleted file mode 100644 index 3df659de9f2..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/foo/KotlinActivity1.kt +++ /dev/null @@ -1,8 +0,0 @@ -package foo - -import android.app.Activity - -open class KotlinActivity1 : Activity() { - val usage = getSomething() -} - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/foo/KotlinActivity2.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/foo/KotlinActivity2.kt deleted file mode 100644 index 0a4bd27fa7e..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/foo/KotlinActivity2.kt +++ /dev/null @@ -1,5 +0,0 @@ -package foo - -import android.app.Activity - -open class KotlinActivity2 : Activity() \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/foo/getSomething.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/foo/getSomething.kt deleted file mode 100644 index 664261fea6e..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/kotlin/foo/getSomething.kt +++ /dev/null @@ -1,3 +0,0 @@ -package foo - -fun getSomething() = "Hello, world!"