Fix ConfigureProjectTestGenerated

2017-01-26 17:34:22 +01:00
parent c4032908c0
commit 46bb636cea
20 changed files with 20 additions and 76 deletions
@@ -29,14 +29,11 @@ android {
        minSdkVersion 7
        targetSdkVersion 16
    }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }

 dependencies {
    compile 'com.android.support:support-v4:13.0.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }

 // VERSION: $VERSION$
@@ -23,12 +23,9 @@ android {
        minSdkVersion 7
        targetSdkVersion 16
    }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }

 dependencies {
    compile 'com.android.support:support-v4:13.0.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
@@ -29,13 +29,10 @@ android {
            buildConfig "public final static boolean IS_LIVE=false;"
        }
    }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 repositories {
    mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
@@ -15,11 +15,8 @@ repositories {
 }

 android {
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }

 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
@@ -12,10 +12,5 @@ repositories {
    mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-}
-android {
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
@@ -10,9 +10,6 @@ android {

    deviceProvider project.ext.fakeProvider
    testServer project.ext.fakeServer
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }

 project.afterEvaluate {
@@ -37,7 +34,7 @@ project.afterEvaluate {

 dependencies {
    compile project(':lib')
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }

 buildscript {
@@ -20,7 +20,7 @@ dependencies {
    debugCompile 'com.android.support:support-v13:13.0.0'

    compile 'com.google.android.gms:play-services:3.1.36'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }

 android {
@@ -61,7 +61,4 @@ android {
        noCompress 'txt'
        ignoreAssetsPattern "!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
    }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
@@ -47,13 +47,10 @@ android {
            signingConfig signingConfigs.debug
        }
    }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 repositories {
    mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
@@ -49,7 +49,6 @@ android {
        // tests/java, tests/res, tests/assets, ...
        // This is a *reset* so it replaces the default paths
        instrumentTest.setRoot('tests')
-        main.java.srcDirs += 'src/main/kotlin'

        // Could also be done with:
        //main.manifest.srcFile 'AndroidManifest.xml'
@@ -64,5 +63,5 @@ repositories {
    mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
@@ -21,12 +21,11 @@ android {
                srcDirs 'src/main/res1', 'src/main/res2'
            }
        }
-        main.java.srcDirs += 'src/main/kotlin'
    }
 }
 repositories {
    mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
@@ -22,14 +22,11 @@ android {
    buildTypes.debug {
        zipAlign true
    }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }

 android.applicationVariants.each { variant ->
    variant.outputFile = file("$project.buildDir/${variant.name}.apk")
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
@@ -4,9 +4,6 @@ apply plugin: 'kotlin-android'
 android {
    compileSdkVersion 15
    buildToolsVersion "17.0"
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }

 // query for all (non-test) variants and inject a new step in the builds
@@ -50,5 +47,5 @@ repositories {
    mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
@@ -21,15 +21,12 @@ repositories {
 dependencies {
    compile 'com.example.android.multiproject:util:1.0'
    releaseCompile 'com.google.guava:guava:11.0.2'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }

 android {
    compileSdkVersion 15
    buildToolsVersion "17.0"
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }

 group = 'com.example.android.multiproject'
@@ -4,9 +4,6 @@ apply plugin: 'kotlin-android'
 android {
    compileSdkVersion 15
    buildToolsVersion "17.0"
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }

 //
@@ -14,7 +11,7 @@ android {
 //
 dependencies {
    compile project(':lib')
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }

 buildscript {
@@ -14,13 +14,10 @@ apply plugin: 'kotlin-android'

 android {
    target = 'android-16'
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 repositories {
    mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
@@ -35,12 +35,11 @@ android {
                srcDir 'src'
            }
        }
-        main.java.srcDirs += 'src/main/kotlin'
    }
 }
 repositories {
    mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
@@ -22,12 +22,9 @@ android {
        minSdkVersion 7
        targetSdkVersion 16
    }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }

 dependencies {
    compile 'com.android.support:support-v4:13.0.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
@@ -13,14 +13,11 @@ android {
        minSdkVersion 7
        targetSdkVersion 16
    }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }

 dependencies {
    compile 'com.android.support:support-v4:13.0.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
 buildscript {
    ext.kotlin_version = '$VERSION$'
@@ -28,14 +28,11 @@ android {
        minSdkVersion 7
        targetSdkVersion 16
    }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }

 dependencies {
    compile 'com.android.support:support-v4:13.0.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }

 // VERSION: $VERSION$
@@ -22,13 +22,10 @@ android {
            packageName = 'com.example.android.gradle.productflavors.amazonappstore'
        }
    }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 repositories {
    mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }