clearly rename test projects
@@ -8,11 +8,11 @@ Ignore("Requires Android SDK")
|
||||
class KotlinAndroidGradleIT: BaseGradleIT() {
|
||||
|
||||
Test fun testSimpleCompile() {
|
||||
val project = Project("AndroidAlfaProject", "1.6")
|
||||
val project = Project("AndroidProject", "1.6")
|
||||
|
||||
project.build("build") {
|
||||
assertSuccessful()
|
||||
assertContains(":LibAlfa:compileReleaseKotlin",
|
||||
assertContains(":Lib:compileReleaseKotlin",
|
||||
":compileFlavor1DebugKotlin",
|
||||
":compileFlavor2DebugKotlin",
|
||||
":compileFlavor1JnidebugKotlin",
|
||||
@@ -30,14 +30,14 @@ class KotlinAndroidGradleIT: BaseGradleIT() {
|
||||
// Run the build second time, assert everything is up-to-date
|
||||
project.build("build") {
|
||||
assertSuccessful()
|
||||
assertContains(":LibAlfa:compileReleaseKotlin UP-TO-DATE", ":LibAlfa:compileRelease UP-TO-DATE")
|
||||
assertContains(":Lib:compileReleaseKotlin UP-TO-DATE", ":Lib:compileRelease UP-TO-DATE")
|
||||
}
|
||||
|
||||
// Run the build third time, re-run tasks
|
||||
|
||||
project.build("build", "--rerun-tasks") {
|
||||
assertSuccessful()
|
||||
assertContains(":LibAlfa:compileReleaseKotlin",
|
||||
assertContains(":Lib:compileReleaseKotlin",
|
||||
":compileFlavor1DebugKotlin",
|
||||
":compileFlavor2DebugKotlin",
|
||||
":compileFlavor1JnidebugKotlin",
|
||||
|
||||
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.gradle.BaseGradleIT.Project
|
||||
class BasicKotlinGradleIT: BaseGradleIT() {
|
||||
|
||||
Test fun testCrossCompile() {
|
||||
val project = Project("alfa")
|
||||
val project = Project("kotlinJavaProject")
|
||||
|
||||
project.build("compileDeployKotlin", "build") {
|
||||
assertSuccessful()
|
||||
@@ -31,7 +31,7 @@ class BasicKotlinGradleIT: BaseGradleIT() {
|
||||
}
|
||||
|
||||
Test fun testKotlinOnlyCompile() {
|
||||
val project = Project("beta")
|
||||
val project = Project("kotlinProject")
|
||||
|
||||
project.build("build") {
|
||||
assertSuccessful()
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
include ':AndroidAlfa', ':LibAlfa'
|
||||
@@ -14,7 +14,7 @@ apply plugin: 'android'
|
||||
apply plugin: 'kotlin-android'
|
||||
|
||||
dependencies {
|
||||
compile project(':LibAlfa')
|
||||
compile project(':Lib')
|
||||
}
|
||||
|
||||
android {
|
||||
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 7.5 KiB After Width: | Height: | Size: 7.5 KiB |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
@@ -7,4 +7,4 @@
|
||||
# Location of the SDK. This is only used by Gradle.
|
||||
# For customization when using a Version Control System, please read the
|
||||
# header note.
|
||||
sdk.dir=C:/Program Files (x86)/Android/android-studio/sdk
|
||||
sdk.dir=C:/Program Files (x86)/Android/android-studio-0.5.1/sdk
|
||||
@@ -0,0 +1 @@
|
||||
include ':Android', ':Lib'
|
||||