From c8d05f8485142761b7666596d45c2b05ea6c30cb Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 26 May 2017 00:12:34 +0300 Subject: [PATCH] Remove most of Gradle tests with Jack Jack is deprecated and Kotlin Gradle plugin throws, so one test checking that build is failing with the exception is enough. --- .../AbstractKotlinAndroidGradleTests.kt | 169 +----------------- .../AndroidDaggerJackProject/app/build.gradle | 41 ----- .../app/proguard-rules.pro | 17 -- .../app/src/main/AndroidManifest.xml | 19 -- .../example/dagger/kotlin/AndroidModule.kt | 44 ----- .../dagger/kotlin/ApplicationComponent.kt | 13 -- .../example/dagger/kotlin/BaseApplication.kt | 11 -- .../com/example/dagger/kotlin/DemoActivity.kt | 12 -- .../example/dagger/kotlin/DemoApplication.kt | 13 -- .../example/dagger/kotlin/ForApplication.kt | 6 - .../example/dagger/kotlin/UseRJavaActivity.kt | 9 - .../example/dagger/kotlin/ui/HomeActivity.kt | 38 ---- .../dagger/kotlin/useBuildConfigJava.kt | 5 - .../app/src/main/res/layout/activity_main.xml | 10 -- .../app/src/main/res/values/strings.xml | 3 - .../app/src/main/res/values/styles.xml | 8 - .../AndroidDaggerJackProject/build.gradle | 18 -- .../gradle.properties | 19 -- .../AndroidDaggerJackProject/settings.gradle | 1 - .../app/build.gradle | 27 --- .../app/src/main/AndroidManifest.xml | 16 -- .../example/androidextensions/MyActivity.kt | 30 ---- .../app/src/main/res/layout/activity_main.xml | 9 - .../app/src/main/res/values/strings.xml | 3 - .../AndroidExtensionsJackProject/build.gradle | 20 --- .../gradle.properties | 1 - .../settings.gradle | 1 - .../app/build.gradle | 43 ----- .../app/src/main/AndroidManifest.xml | 22 --- .../github/frankiesardo/icepick/CustomView.kt | 28 --- .../github/frankiesardo/icepick/Example.kt | 19 -- .../frankiesardo/icepick/ExampleBundler.kt | 18 -- .../frankiesardo/icepick/MainActivity.kt | 49 ----- .../github/frankiesardo/icepick/MyBundler.kt | 17 -- .../com/sample/icepick/lib/BaseActivity.kt | 24 --- .../com/sample/icepick/lib/BaseCustomView.kt | 34 ---- .../app/src/main/res/layout/activity_main.xml | 12 -- .../app/src/main/res/menu/main.xml | 7 - .../app/src/main/res/values/strings.xml | 5 - .../AndroidIcepickJackProject/build.gradle | 11 -- .../gradle.properties | 1 - .../AndroidIcepickJackProject/settings.gradle | 1 - 42 files changed, 3 insertions(+), 851 deletions(-) delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/build.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/proguard-rules.pro delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/AndroidManifest.xml delete mode 100755 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/AndroidModule.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/ApplicationComponent.kt delete mode 100755 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/BaseApplication.kt delete mode 100755 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/DemoActivity.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/DemoApplication.kt delete mode 100755 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/ForApplication.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/UseRJavaActivity.kt delete mode 100755 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/ui/HomeActivity.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/useBuildConfigJava.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/res/layout/activity_main.xml delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/res/values/strings.xml delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/res/values/styles.xml delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/build.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/gradle.properties delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/settings.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/build.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/src/main/AndroidManifest.xml delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/src/main/java/com/example/androidextensions/MyActivity.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/src/main/res/layout/activity_main.xml delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/src/main/res/values/strings.xml delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/build.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/gradle.properties delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/settings.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/build.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/AndroidManifest.xml delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/CustomView.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/Example.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/ExampleBundler.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/MainActivity.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/MyBundler.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/sample/icepick/lib/BaseActivity.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/sample/icepick/lib/BaseCustomView.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/res/layout/activity_main.xml delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/res/menu/main.xml delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/res/values/strings.xml delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/build.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/gradle.properties delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/settings.gradle 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 c0d93717f1d..6b2615dab81 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 @@ -222,176 +222,13 @@ abstract class AbstractKotlinAndroidWithJackGradleTests( super.defaultBuildOptions().copy(androidHome = File("../../../dependencies/android-sdk-for-tests"), androidGradlePluginVersion = androidGradlePluginVersion, javaHome = File(getEnvJDK_18())) - @Test - fun testAndroidTestCompilation() { - val project = Project("AndroidJackProject", gradleVersion) - - project.build("assembleAndroidTest") { - assertSuccessful() - assertFileExists("Android/build/tmp/kotlin-classes/flavor1Debug.jar") - assertFileExists("Android/build/tmp/kotlin-classes/flavor2Debug.jar") - assertFileExists("Android/build/tmp/kotlin-classes/flavor1DebugAndroidTest.jar") - assertFileExists("Android/build/tmp/kotlin-classes/flavor2DebugAndroidTest.jar") - assertFileExists("Android/build/outputs/apk/Android-flavor1-debug-androidTest.apk") - assertFileExists("Android/build/outputs/apk/Android-flavor2-debug-androidTest.apk") - } - } - @Test fun testSimpleCompile() { val project = Project("AndroidJackProject", gradleVersion) - project.build("build", "test") { - assertSuccessful() - assertContains( - ":Lib:compileReleaseKotlin", - - ":compileFlavor1DebugKotlin", - ":zipKotlinClassesForFlavor1Debug", - ":transformKotlinClassesWithJillForFlavor1Debug", - - ":compileFlavor2DebugKotlin", - ":zipKotlinClassesForFlavor2Debug", - ":transformKotlinClassesWithJillForFlavor2Debug", - - ":compileFlavor1JnidebugKotlin", - ":zipKotlinClassesForFlavor1Jnidebug", - ":transformKotlinClassesWithJillForFlavor1Jnidebug", - - ":compileFlavor1ReleaseKotlin", - ":zipKotlinClassesForFlavor1Release", - ":transformKotlinClassesWithJillForFlavor1Release", - - ":compileFlavor2JnidebugKotlin", - ":zipKotlinClassesForFlavor2Jnidebug", - ":transformKotlinClassesWithJillForFlavor2Jnidebug", - - ":compileFlavor2ReleaseKotlin", - ":zipKotlinClassesForFlavor2Release", - ":transformKotlinClassesWithJillForFlavor2Release", - - ":compileFlavor1DebugUnitTestKotlin", - "InternalDummyTest PASSED" - ) - checkKotlinGradleBuildServices() - } - - // Run the build second time, assert everything is up-to-date - project.build("build") { - assertSuccessful() - assertContains( - ":Lib:compileReleaseKotlin UP-TO-DATE", - - ":compileFlavor1DebugKotlin UP-TO-DATE", - ":zipKotlinClassesForFlavor1Debug UP-TO-DATE", - ":transformKotlinClassesWithJillForFlavor1Debug UP-TO-DATE", - - ":compileFlavor2DebugKotlin UP-TO-DATE", - ":zipKotlinClassesForFlavor2Debug UP-TO-DATE", - ":transformKotlinClassesWithJillForFlavor2Debug UP-TO-DATE", - - ":compileFlavor1JnidebugKotlin UP-TO-DATE", - ":zipKotlinClassesForFlavor1Jnidebug UP-TO-DATE", - ":transformKotlinClassesWithJillForFlavor1Jnidebug UP-TO-DATE", - - ":compileFlavor1ReleaseKotlin UP-TO-DATE", - ":zipKotlinClassesForFlavor1Release UP-TO-DATE", - ":transformKotlinClassesWithJillForFlavor1Release UP-TO-DATE", - - ":compileFlavor2JnidebugKotlin UP-TO-DATE", - ":zipKotlinClassesForFlavor2Jnidebug UP-TO-DATE", - ":transformKotlinClassesWithJillForFlavor2Jnidebug UP-TO-DATE", - - ":compileFlavor2ReleaseKotlin UP-TO-DATE", - ":zipKotlinClassesForFlavor2Release UP-TO-DATE", - ":transformKotlinClassesWithJillForFlavor2Release UP-TO-DATE" - ) - } - - project.build("build", "--rerun-tasks") { - assertSuccessful() - assertContains( - ":Lib:compileReleaseKotlin", - - ":compileFlavor1DebugKotlin", - ":zipKotlinClassesForFlavor1Debug", - ":transformKotlinClassesWithJillForFlavor1Debug", - - ":compileFlavor2DebugKotlin", - ":zipKotlinClassesForFlavor2Debug", - ":transformKotlinClassesWithJillForFlavor2Debug", - - ":compileFlavor1JnidebugKotlin", - ":zipKotlinClassesForFlavor1Jnidebug", - ":transformKotlinClassesWithJillForFlavor1Jnidebug", - - ":compileFlavor1ReleaseKotlin", - ":zipKotlinClassesForFlavor1Release", - ":transformKotlinClassesWithJillForFlavor1Release", - - ":compileFlavor2JnidebugKotlin", - ":zipKotlinClassesForFlavor2Jnidebug", - ":transformKotlinClassesWithJillForFlavor2Jnidebug", - - ":compileFlavor2ReleaseKotlin", - ":zipKotlinClassesForFlavor2Release", - ":transformKotlinClassesWithJillForFlavor2Release", - - ":compileFlavor1DebugUnitTestKotlin", - "InternalDummyTest PASSED" - ) - checkKotlinGradleBuildServices() - } - - } - - @Test - fun testDagger() { - val project = Project("AndroidDaggerJackProject", gradleVersion) - val options = defaultBuildOptions().copy(incremental = false) - - project.build("assembleDebug", options = options) { - assertSuccessful() - assertContains( - ":kaptDebugKotlin", - ":compileDebugKotlin", - ":zipKotlinClassesForDebug", - ":transformKotlinClassesWithJillForDebug", - ":transformJackWithJackForDebug" - ) - } - } - - @Test - fun testAndroidExtensions() { - val project = Project("AndroidExtensionsJackProject", gradleVersion) - val options = defaultBuildOptions().copy(incremental = false) - - project.build("assembleDebug", options = options) { - assertSuccessful() - assertContains( - ":compileDebugKotlin", - ":zipKotlinClassesForDebug", - ":transformKotlinClassesWithJillForDebug", - ":transformJackWithJackForDebug" - ) - } - } - - @Test - fun testIcepick() { - val project = Project("AndroidIcepickJackProject", gradleVersion) - val options = defaultBuildOptions().copy(incremental = false) - - project.build("assembleDebug", options = options) { - assertSuccessful() - assertContains( - ":kaptDebugKotlin", - ":compileDebugKotlin", - ":zipKotlinClassesForDebug", - ":transformKotlinClassesWithJillForDebug", - ":transformJackWithJackForDebug" - ) + project.build("assemble") { + assertFailed() + assertContains("Kotlin Gradle plugin does not support the deprecated Jack toolchain") } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/build.gradle deleted file mode 100644 index f8695b08925..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/build.gradle +++ /dev/null @@ -1,41 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-kapt' - -android { - compileSdkVersion 25 - buildToolsVersion "25.0.1" - - defaultConfig { - applicationId "com.example.dagger.kotlin" - minSdkVersion 14 - targetSdkVersion 25 - versionCode 1 - versionName "1.0" - - jackOptions { - enabled true - } - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } -} - -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:25.1.0' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - - compile 'com.google.dagger:dagger:2.2' - kapt 'com.google.dagger:dagger-compiler:2.2' - provided 'org.glassfish:javax.annotation:10.0-b28' -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/proguard-rules.pro b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/proguard-rules.pro deleted file mode 100644 index 2193714bb6b..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/yan/Library/Android/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/AndroidManifest.xml deleted file mode 100644 index 4268e154dfc..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/AndroidModule.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/AndroidModule.kt deleted file mode 100755 index da11452cc68..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/AndroidModule.kt +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2013 Square, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.example.dagger.kotlin - -import android.content.Context -import android.content.Context.LOCATION_SERVICE -import android.location.LocationManager -import dagger.Module -import dagger.Provides -import javax.inject.Singleton - -/** - * A module for Android-specific dependencies which require a [Context] or - * [android.app.Application] to create. - */ -@Module class AndroidModule(private val application: BaseApplication) { - - /** - * Allow the application context to be injected but require that it be annotated with - * [@Annotation][ForApplication] to explicitly differentiate it from an activity context. - */ - @Provides @Singleton @ForApplication - fun provideApplicationContext(): Context { - return application - } - - @Provides @Singleton - fun provideLocationManager(): LocationManager { - return application.getSystemService(LOCATION_SERVICE) as LocationManager - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/ApplicationComponent.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/ApplicationComponent.kt deleted file mode 100644 index 32b153dd9ed..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/ApplicationComponent.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.dagger.kotlin - -import com.example.dagger.kotlin.ui.HomeActivity -import dagger.Component -import javax.inject.Singleton - -@Singleton -@Component(modules = arrayOf(AndroidModule::class)) -interface ApplicationComponent { - fun inject(application: BaseApplication) - fun inject(homeActivity: HomeActivity) - fun inject(demoActivity: DemoActivity) -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/BaseApplication.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/BaseApplication.kt deleted file mode 100755 index 69eb1ef1ab2..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/BaseApplication.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.example.dagger.kotlin - -import android.app.Application - -abstract class BaseApplication : Application() { - - protected fun initDaggerComponent(): ApplicationComponent { - return DaggerApplicationComponent.builder().androidModule(AndroidModule(this)).build() - } - -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/DemoActivity.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/DemoActivity.kt deleted file mode 100755 index 06168ee51ad..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/DemoActivity.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.example.dagger.kotlin - -import android.app.Activity -import android.os.Bundle - -abstract class DemoActivity : Activity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - // Perform injection so that when this call returns all dependencies will be available for use. - (application as DemoApplication).component.inject(this) - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/DemoApplication.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/DemoApplication.kt deleted file mode 100644 index 6ea6c459bac..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/DemoApplication.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.dagger.kotlin - -class DemoApplication : BaseApplication() { - lateinit var component: ApplicationComponent - - override fun onCreate() { - super.onCreate() - val component = initDaggerComponent() - component.inject(this) // As of now, LocationManager should be injected into this. - this.component = component - } - -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/ForApplication.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/ForApplication.kt deleted file mode 100755 index a3ec79ff373..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/ForApplication.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.example.dagger.kotlin - -import javax.inject.Qualifier - -@Qualifier -annotation class ForApplication diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/UseRJavaActivity.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/UseRJavaActivity.kt deleted file mode 100644 index 34b808da2d9..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/UseRJavaActivity.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.example.dagger.kotlin - -import android.app.Activity - -class UseRJavaActivity : Activity() { - fun useRJava() { - val app_name = getResources().getString(R.string.app_name) - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/ui/HomeActivity.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/ui/HomeActivity.kt deleted file mode 100755 index 7789641b694..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/ui/HomeActivity.kt +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2013 Square, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.example.dagger.kotlin.ui - -import android.location.LocationManager -import android.os.Bundle -import com.example.dagger.kotlin.DemoActivity -import com.example.dagger.kotlin.DemoApplication -import com.example.dagger.kotlin.R -import kotlinx.android.synthetic.main.activity_main.locationInfo -import javax.inject.Inject - -class HomeActivity : DemoActivity() { - @Inject - lateinit var locationManager: LocationManager - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - (application as DemoApplication).component.inject(this) - - // TODO do something with the injected dependencies here! - locationInfo.text = "Injected LocationManager:\n$locationManager" - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/useBuildConfigJava.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/useBuildConfigJava.kt deleted file mode 100644 index 4a6718ee884..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/useBuildConfigJava.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.dagger.kotlin - -fun useBuildConfigJava() { - if (BuildConfig.APPLICATION_ID != "com.example.dagger.kotlin") throw AssertionError() -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/res/layout/activity_main.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 35f42cfe411..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/res/values/strings.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/res/values/strings.xml deleted file mode 100644 index 67b44b1a8cd..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - kotlin - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/res/values/styles.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/res/values/styles.xml deleted file mode 100644 index 766ab993048..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/build.gradle deleted file mode 100644 index 0106d71996d..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -buildscript { - repositories { - mavenLocal() - jcenter() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "com.android.tools.build:gradle:$android_tools_version" - } -} - -allprojects { - repositories { - mavenLocal() - mavenCentral() - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/gradle.properties deleted file mode 100644 index e4a345a8d68..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/gradle.properties +++ /dev/null @@ -1,19 +0,0 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. - -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html - -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -org.gradle.jvmargs=-Xmx1536M \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/settings.gradle deleted file mode 100644 index e7b4def49cb..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app' diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/build.gradle deleted file mode 100644 index ebc981f7ee2..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/build.gradle +++ /dev/null @@ -1,27 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' - -android { - compileSdkVersion 23 - buildToolsVersion "25.0.1" - - defaultConfig { - applicationId "com.example.dagger.kotlin" - minSdkVersion 14 - targetSdkVersion 23 - versionCode 1 - versionName "1.0" - - jackOptions { enabled true } - } - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } -} - -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.1.1' - compile "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/AndroidExtensionsJackProject/app/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/src/main/AndroidManifest.xml deleted file mode 100644 index 5063f2b77f8..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/src/main/java/com/example/androidextensions/MyActivity.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/src/main/java/com/example/androidextensions/MyActivity.kt deleted file mode 100644 index b9c0985d26d..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/src/main/java/com/example/androidextensions/MyActivity.kt +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.example.androidextensions - -import android.os.Bundle -import android.app.Activity -import kotlinx.android.synthetic.main.activity_main.textView - -class HomeActivity : Activity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - - this.textView.setText("Hello, world!") - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/src/main/res/layout/activity_main.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 02b0685b4a4..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/src/main/res/values/strings.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/src/main/res/values/strings.xml deleted file mode 100644 index 67b44b1a8cd..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - kotlin - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/build.gradle deleted file mode 100644 index cda1d25eec7..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/build.gradle +++ /dev/null @@ -1,20 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - repositories { - mavenLocal() - jcenter() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "com.android.tools.build:gradle:$android_tools_version" - } -} - -allprojects { - repositories { - mavenLocal() - jcenter() - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/gradle.properties deleted file mode 100644 index 5fcc74643cf..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -org.gradle.jvmargs=-ea -XX:MaxPermSize=512m \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/settings.gradle deleted file mode 100644 index e7b4def49cb..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsJackProject/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app' diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/build.gradle deleted file mode 100644 index 6a4ec45a6b7..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/build.gradle +++ /dev/null @@ -1,43 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' - -dependencies { - compile "frankiesardo:icepick:3.2.0" - kapt "frankiesardo:icepick-processor:3.2.0" - - compile 'org.parceler:parceler-api:1.1.5' - kapt 'org.parceler:parceler:1.1.5' - - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" -} - -android { - compileSdkVersion 23 - buildToolsVersion "25.0.1" - - defaultConfig { - applicationId "com.example.icepick.kotlin" - minSdkVersion 14 - targetSdkVersion 23 - versionCode 1 - versionName "1.0" - - jackOptions { enabled true } - } - - lintOptions { - abortOnError false - } - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } -} - -repositories { - mavenCentral() - maven { - url "https://clojars.org/repo/" - } - mavenLocal() -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/AndroidManifest.xml deleted file mode 100644 index ede20458e43..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/CustomView.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/CustomView.kt deleted file mode 100644 index e8efda87823..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/CustomView.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.github.frankiesardo.icepick - -import android.content.Context -import android.os.Parcelable -import android.util.AttributeSet -import com.sample.icepick.lib.BaseCustomView -import icepick.State - -class CustomView : BaseCustomView { - @JvmField @State - var textColor: Int? = null - - constructor(context: Context) : super(context) - constructor(context: Context, attrs: AttributeSet) : super(context, attrs) - constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) - - fun setTextColorWithAnotherMethod(color: Int) { - this.textColor = color - setTextColor(textColor!!) - } - - override fun onRestoreInstanceState(state: Parcelable) { - super.onRestoreInstanceState(state) - if (textColor != null) { - setTextColorWithAnotherMethod(textColor!!) - } - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/Example.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/Example.kt deleted file mode 100644 index 5bb6ac26cd3..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/Example.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.github.frankiesardo.icepick - -import org.parceler.Parcel - -@Parcel -class Example { - lateinit var name: String - - @JvmField - var age: Int = 0 - - constructor() { /*Required empty bean constructor*/ - } - - constructor(age: Int, name: String) { - this.age = age - this.name = name - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/ExampleBundler.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/ExampleBundler.kt deleted file mode 100644 index 7ef36eaf348..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/ExampleBundler.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.github.frankiesardo.icepick - -import android.os.Bundle -import android.os.Parcelable - -import org.parceler.Parcels - -import icepick.Bundler - -class ExampleBundler : Bundler { - override fun put(s: String, example: Any, bundle: Bundle) { - bundle.putParcelable(s, Parcels.wrap(example)) - } - - override fun get(s: String, bundle: Bundle): Any { - return Parcels.unwrap(bundle.getParcelable(s)) - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/MainActivity.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/MainActivity.kt deleted file mode 100644 index a6d43e9a61d..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/MainActivity.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.github.frankiesardo.icepick - -import android.graphics.Color -import android.os.Bundle -import android.view.Menu -import android.view.MenuItem -import com.sample.icepick.lib.BaseActivity -import icepick.State - -class MainActivity : BaseActivity() { - @JvmField @State(MyBundler::class) - var message: String? = null - - lateinit var customView: CustomView - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - customView = findViewById(R.id.custom_view) as CustomView - updateText() - } - - private fun updateText() { - val defaultText = if (message == null || baseMessage == null) { - "Use the menu to add some state" - } else { - baseMessage + message - } - customView.text = defaultText - } - - override fun onCreateOptionsMenu(menu: Menu): Boolean { - menuInflater.inflate(R.menu.main, menu) - return super.onPrepareOptionsMenu(menu) - } - - override fun onMenuItemSelected(featureId: Int, item: MenuItem): Boolean { - if (item.itemId == R.id.action_add_state) { - customView.setBackgroundColorWithAnotherMethod(Color.BLUE) - customView.setTextColorWithAnotherMethod(Color.WHITE) - - baseMessage = "This state will be automagically " - message = "saved and restored" - updateText() - return true - } - return super.onMenuItemSelected(featureId, item) - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/MyBundler.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/MyBundler.kt deleted file mode 100644 index 5827899383f..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/github/frankiesardo/icepick/MyBundler.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.github.frankiesardo.icepick - -import android.os.Bundle - -import icepick.Bundler - -class MyBundler : Bundler { - override fun put(key: String, value: String?, bundle: Bundle) { - if (value != null) { - bundle.putString(key, value + "*") - } - } - - override fun get(key: String, bundle: Bundle): String? { - return bundle.getString(key) - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/sample/icepick/lib/BaseActivity.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/sample/icepick/lib/BaseActivity.kt deleted file mode 100644 index 3bb668d8995..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/sample/icepick/lib/BaseActivity.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.sample.icepick.lib - -import android.app.Activity -import android.os.Bundle -import android.os.Parcelable -import icepick.Icepick -import icepick.State -import android.util.Log - -open class BaseActivity : Activity() { - @JvmField @State - var baseMessage: String? = null - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - Icepick.restoreInstanceState(this, savedInstanceState) - } - - override fun onSaveInstanceState(outState: Bundle) { - super.onSaveInstanceState(outState) - Icepick.saveInstanceState(this, outState) - } -} - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/sample/icepick/lib/BaseCustomView.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/sample/icepick/lib/BaseCustomView.kt deleted file mode 100644 index 0c803627dff..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/java/com/sample/icepick/lib/BaseCustomView.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.sample.icepick.lib - -import android.content.Context -import android.os.Parcelable -import android.util.AttributeSet -import android.widget.TextView - -import icepick.Icepick -import icepick.State - -open class BaseCustomView : TextView { - @JvmField @State - var backgroundColor: Int? = null - - constructor(context: Context) : super(context) - constructor(context: Context, attrs: AttributeSet) : super(context, attrs) - constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) - - fun setBackgroundColorWithAnotherMethod(color: Int) { - this.backgroundColor = color - setBackgroundColor(color) - } - - override fun onSaveInstanceState(): Parcelable { - return Icepick.saveInstanceState(this, super.onSaveInstanceState()) - } - - override fun onRestoreInstanceState(state: Parcelable) { - super.onRestoreInstanceState(Icepick.restoreInstanceState(this, state)) - if (backgroundColor != null) { - setBackgroundColorWithAnotherMethod(backgroundColor!!) - } - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/res/layout/activity_main.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 5a309736616..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/res/menu/main.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/res/menu/main.xml deleted file mode 100644 index d83a242a320..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/res/menu/main.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/res/values/strings.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/res/values/strings.xml deleted file mode 100644 index c766721070e..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - Icepick - Add some state - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/build.gradle deleted file mode 100644 index b55345eda01..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -buildscript { - repositories { - mavenLocal() - mavenCentral() - jcenter() - } - dependencies { - classpath "com.android.tools.build:gradle:$android_tools_version" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/gradle.properties deleted file mode 100644 index 5fcc74643cf..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -org.gradle.jvmargs=-ea -XX:MaxPermSize=512m \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/settings.gradle deleted file mode 100644 index 4c90568abd7..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickJackProject/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include 'app'