From 6a32e7bd5a580b9b14f17f3463f4a4d5513b3e8f Mon Sep 17 00:00:00 2001 From: "nataliya.valtman" Date: Fri, 18 Jun 2021 16:50:17 +0300 Subject: [PATCH] Add typealias testcase for incremental compilation --- .../simpleNewIncremental/build.gradle | 16 ++++++++++++++++ .../simpleNewIncremental/lib/build.gradle | 5 +++++ .../lib/src/main/java/foo/JavaClassToDelete.java | 9 +++++++++ .../lib/src/main/java/foo/JavaClassToUpdate.java | 9 +++++++++ .../lib/src/main/kotlin/bar/lib.kt | 6 ++++++ .../src/main/kotlin/foo/KotlinClassToDelete.kt | 12 ++++++++++++ .../src/main/kotlin/foo/KotlinClassToUpdate.kt | 15 +++++++++++++++ .../lib/src/main/kotlin/foo/KotlinInterface.kt | 10 ++++++++++ .../lib/src/main/kotlin/foo/KotlinOpenClass.kt | 13 +++++++++++++ .../src/main/kotlin/foo/NewKotlinOpenClass.kt | 10 ++++++++++ .../lib/src/main/kotlin/foo/types.kt | 8 ++++++++ .../simpleNewIncremental/main/build.gradle | 6 ++++++ .../src/main/java/foo/MainJavaClassToDelete.java | 12 ++++++++++++ .../src/main/java/foo/MainJavaClassToUpdate.java | 16 ++++++++++++++++ .../main/src/main/kotlin/bar/main.kt | 12 ++++++++++++ .../main/kotlin/foo/MainKotlinClassToDelete.kt | 12 ++++++++++++ .../main/kotlin/foo/MainKotlinClassToUpdate.kt | 12 ++++++++++++ .../src/main/kotlin/foo/MainKotlinOpenClass.kt | 9 +++++++++ .../main/kotlin/foo/NewMainKotlinOpenClass.kt | 9 +++++++++ .../simpleNewIncremental/settings.gradle | 2 ++ 20 files changed, 203 insertions(+) create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/build.gradle create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/build.gradle create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/java/foo/JavaClassToDelete.java create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/java/foo/JavaClassToUpdate.java create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/bar/lib.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/KotlinClassToDelete.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/KotlinClassToUpdate.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/KotlinInterface.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/KotlinOpenClass.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/NewKotlinOpenClass.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/types.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/build.gradle create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/java/foo/MainJavaClassToDelete.java create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/java/foo/MainJavaClassToUpdate.java create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/bar/main.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/foo/MainKotlinClassToDelete.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/foo/MainKotlinClassToUpdate.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/foo/MainKotlinOpenClass.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/foo/NewMainKotlinOpenClass.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/settings.gradle diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/build.gradle new file mode 100644 index 00000000000..58099e5f2d6 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/build.gradle @@ -0,0 +1,16 @@ +buildscript { + repositories { + mavenLocal() + mavenCentral() + } + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +subprojects { + repositories { + mavenLocal() + mavenCentral() + } +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/build.gradle new file mode 100644 index 00000000000..c27bc6f3fc0 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/build.gradle @@ -0,0 +1,5 @@ +apply plugin: 'kotlin' + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/java/foo/JavaClassToDelete.java b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/java/foo/JavaClassToDelete.java new file mode 100644 index 00000000000..6c2c4c14329 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/java/foo/JavaClassToDelete.java @@ -0,0 +1,9 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package foo; + +public class JavaClassToDelete { +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/java/foo/JavaClassToUpdate.java b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/java/foo/JavaClassToUpdate.java new file mode 100644 index 00000000000..4684ee6162e --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/java/foo/JavaClassToUpdate.java @@ -0,0 +1,9 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package foo; + +public class JavaClassToUpdate { +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/bar/lib.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/bar/lib.kt new file mode 100644 index 00000000000..2b649c3abde --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/bar/lib.kt @@ -0,0 +1,6 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package bar diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/KotlinClassToDelete.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/KotlinClassToDelete.kt new file mode 100644 index 00000000000..c185f460eac --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/KotlinClassToDelete.kt @@ -0,0 +1,12 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package foo + +class KotlinClassToDelete { + fun empty() {} + + fun methodToDelete() = "could be deleted" +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/KotlinClassToUpdate.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/KotlinClassToUpdate.kt new file mode 100644 index 00000000000..c1e72ac747f --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/KotlinClassToUpdate.kt @@ -0,0 +1,15 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package foo + +class KotlinClassToUpdate : KotlinInterface { + override val values: Type + get() = "0" + + fun simpleMethod() = "foo" + + fun methodToDelete() {} +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/KotlinInterface.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/KotlinInterface.kt new file mode 100644 index 00000000000..7005d886e9c --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/KotlinInterface.kt @@ -0,0 +1,10 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package foo + +interface KotlinInterface { + val values: Type +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/KotlinOpenClass.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/KotlinOpenClass.kt new file mode 100644 index 00000000000..836d8f54663 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/KotlinOpenClass.kt @@ -0,0 +1,13 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package foo + +open class KotlinOpenClass { + fun methodToOverride() { + print("KotlinOpenClass.methodToOverride") + } + open protected fun protectedMethod() {} +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/NewKotlinOpenClass.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/NewKotlinOpenClass.kt new file mode 100644 index 00000000000..e3286cbb1c0 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/NewKotlinOpenClass.kt @@ -0,0 +1,10 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package foo + +open class NewKotlinOpenClass : KotlinOpenClass() { + override fun protectedMethod() {} +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/types.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/types.kt new file mode 100644 index 00000000000..12c2ea1a206 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/lib/src/main/kotlin/foo/types.kt @@ -0,0 +1,8 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package foo + +typealias Type = String \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/build.gradle new file mode 100644 index 00000000000..d259fc0a7c9 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/build.gradle @@ -0,0 +1,6 @@ +apply plugin: 'kotlin' + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation project(':lib') +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/java/foo/MainJavaClassToDelete.java b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/java/foo/MainJavaClassToDelete.java new file mode 100644 index 00000000000..32112a5666e --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/java/foo/MainJavaClassToDelete.java @@ -0,0 +1,12 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package foo; + +public class MainJavaClassToDelete { + public String simpleMethod() { + return getClass().getSimpleName(); + } +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/java/foo/MainJavaClassToUpdate.java b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/java/foo/MainJavaClassToUpdate.java new file mode 100644 index 00000000000..f35f22cc474 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/java/foo/MainJavaClassToUpdate.java @@ -0,0 +1,16 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package foo; + +public class MainJavaClassToUpdate { + public String simpleMethod() { + return "foo"; + } + + public void methodToDelete(String arg) { + //do nothing + } +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/bar/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/bar/main.kt new file mode 100644 index 00000000000..4c1750bcac9 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/bar/main.kt @@ -0,0 +1,12 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package bar + +import foo.NewMainKotlinOpenClass + +fun callOverrideMethod() { + NewMainKotlinOpenClass().methodToOverride() +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/foo/MainKotlinClassToDelete.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/foo/MainKotlinClassToDelete.kt new file mode 100644 index 00000000000..006f5de9c04 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/foo/MainKotlinClassToDelete.kt @@ -0,0 +1,12 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package foo + +class MainKotlinClassToDelete { + + fun simpleMethod() = javaClass.simpleName + +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/foo/MainKotlinClassToUpdate.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/foo/MainKotlinClassToUpdate.kt new file mode 100644 index 00000000000..99d2a6d28d2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/foo/MainKotlinClassToUpdate.kt @@ -0,0 +1,12 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package foo + +class MainKotlinClassToUpdate { + fun simpleMethod() = "foo" + + fun methodToDelete(arg: String) {} +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/foo/MainKotlinOpenClass.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/foo/MainKotlinOpenClass.kt new file mode 100644 index 00000000000..bb089972f1a --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/foo/MainKotlinOpenClass.kt @@ -0,0 +1,9 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package foo + +open class MainKotlinOpenClass : NewKotlinOpenClass() { +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/foo/NewMainKotlinOpenClass.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/foo/NewMainKotlinOpenClass.kt new file mode 100644 index 00000000000..e9f04002d05 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/main/src/main/kotlin/foo/NewMainKotlinOpenClass.kt @@ -0,0 +1,9 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package foo + +class NewMainKotlinOpenClass : MainKotlinOpenClass() { +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/settings.gradle new file mode 100644 index 00000000000..7c6958398fa --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleNewIncremental/settings.gradle @@ -0,0 +1,2 @@ +include ':main', ':lib' +