azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migration to AGP 2.3.0

Browse Source
This commit is contained in:
Sergey Igushkin
2017-05-15 16:17:12 +03:00
committed by Alexey Tsvetkov
parent 6e721c4cee
commit a68f7d79f5
17 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt
+2 -17
View File
@@ -6,7 +6,7 @@ import org.junit.Test
import java.io.File
class KotlinAndroidGradleCLIOnly : AbstractKotlinAndroidGradleTests(gradleVersion = "2.14.1", androidGradlePluginVersion = "1.5.+")
class KotlinAndroidGradleCLIOnly : AbstractKotlinAndroidGradleTests(gradleVersion = "3.3", androidGradlePluginVersion = "2.3.0")
class KotlinAndroidWithJackGradleCLIOnly : AbstractKotlinAndroidWithJackGradleTests(gradleVersion = "3.3", androidGradlePluginVersion = "2.3.+")
@@ -114,8 +114,6 @@ fun getSomething() = 10
fun testIncrementalBuildWithNoChanges() {
val project = Project("AndroidIncrementalSingleModuleProject", gradleVersion)
val tasksToExecute = arrayOf(
":app:prepareComAndroidSupportAppcompatV72311Library",
":app:prepareComAndroidSupportSupportV42311Library",
":app:compileDebugKotlin",
":app:compileDebugJavaWithJavac"
)
@@ -148,25 +146,12 @@ fun getSomething() = 10
// rebuilt because BuildConfig.java was regenerated (timestamp was changed)
val useBuildConfigJavaKt = project.projectDir.getFileByName("useBuildConfigJava.kt")
val stringsXml = project.projectDir.getFileByName("strings.xml")
stringsXml.modify { """
<resources>
<string name="app_name">kotlin</string>
<string name="app_name1">kotlin1</string>
</resources>
""" }
// rebuilt because R.java changed
val homeActivityKt = project.projectDir.getFileByName("HomeActivity.kt")
val useRJavaActivity = project.projectDir.getFileByName("UseRJavaActivity.kt")
project.build(":app:assembleDebug", options = options) {
assertSuccessful()
assertCompiledKotlinSources(project.relativize(
androidModuleKt,
baseApplicationKt,
useBuildConfigJavaKt,
homeActivityKt,
useRJavaActivity
useBuildConfigJavaKt
))
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerProject/app/build.gradle
+1 -1
View File
@@ -16,7 +16,7 @@ apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
buildToolsVersion "25.0.2"
defaultConfig {
applicationId "com.example.dagger.kotlin"
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/build.gradle
+1 -1
View File
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
buildToolsVersion "25.0.2"
defaultConfig {
applicationId "com.example.dagger.kotlin"
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickProject/app/build.gradle
+1 -1
View File
@@ -13,7 +13,7 @@ dependencies {
android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
buildToolsVersion "25.0.2"
defaultConfig {
applicationId "com.example.icepick.kotlin"
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/build.gradle
+1 -1
View File
@@ -16,7 +16,7 @@ apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
buildToolsVersion "25.0.2"
defaultConfig {
applicationId "foo"
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidKaptChangingDependencies/aaa/build.gradle
+1 -1
View File
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
buildToolsVersion "25.0.2"
defaultConfig {
minSdkVersion 19
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidKaptChangingDependencies/app/build.gradle
+1 -1
View File
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
buildToolsVersion "25.0.2"
defaultConfig {
applicationId "com.example.kapt"
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidKaptChangingDependencies/lib-a/build.gradle
+1 -1
View File
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
buildToolsVersion "25.0.2"
defaultConfig {
minSdkVersion 19
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/build.gradle
+1 -1
View File
@@ -9,7 +9,7 @@ dependencies {
android {
compileSdkVersion 22
buildToolsVersion "23.0.1"
buildToolsVersion "25.0.2"
sourceSets {
main.java.srcDirs += 'src/main/java2'
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle
+1 -1
View File
@@ -10,7 +10,7 @@ dependencies {
android {
compileSdkVersion 22
buildToolsVersion "23.0.1"
buildToolsVersion "25.0.2"
defaultConfig {
minSdkVersion 7
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle
+1 -1
View File
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
android {
compileSdkVersion 22
buildToolsVersion "23.0.1"
buildToolsVersion "25.0.2"
sourceSets {
main.kotlin.srcDirs += 'root/kotlin'
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-butterknife/app/build.gradle
+1 -1
View File
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-kapt'
android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
buildToolsVersion "25.0.2"
defaultConfig {
applicationId "org.example.kotlin.butterknife"
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dagger/app/build.gradle
+1 -1
View File
@@ -5,7 +5,7 @@ apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
buildToolsVersion "25.0.2"
defaultConfig {
applicationId "com.example.dagger.kotlin"
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/build.gradle
+1 -1
View File
@@ -5,7 +5,7 @@ apply plugin: 'kotlin-kapt'
android {
compileSdkVersion 23
buildToolsVersion '23.0.1'
buildToolsVersion '25.0.2'
defaultConfig {
minSdkVersion 14
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-realm/build.gradle
+1 -1
View File
@@ -22,7 +22,7 @@ apply plugin: 'realm-android'
android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
buildToolsVersion "25.0.2"
defaultConfig {
applicationId 'io.realm.examples.kotlin'
minSdkVersion 14
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/kt15001/app/build.gradle
+1 -1
View File
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-kapt'
android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
buildToolsVersion "25.0.2"
defaultConfig {
applicationId "com.example.kt15001"
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptKt15814/app/build.gradle
+1 -1
View File
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
buildToolsVersion "25.0.2"
defaultConfig {
applicationId "com.example.genclassesnotfound"
minSdkVersion 19