Use implementation instead of compile in GradleIT, fix versions
This commit is contained in:
+11
-44
@@ -1,6 +1,7 @@
|
|||||||
package org.jetbrains.kotlin.gradle
|
package org.jetbrains.kotlin.gradle
|
||||||
|
|
||||||
import org.gradle.api.logging.LogLevel
|
import org.gradle.api.logging.LogLevel
|
||||||
|
import org.gradle.api.logging.configuration.WarningMode
|
||||||
import org.jetbrains.kotlin.gradle.util.*
|
import org.jetbrains.kotlin.gradle.util.*
|
||||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||||
import org.jetbrains.kotlin.test.util.KtTestUtil
|
import org.jetbrains.kotlin.test.util.KtTestUtil
|
||||||
@@ -23,7 +24,7 @@ open class KotlinAndroid36GradleIT : KotlinAndroid33GradleIT() {
|
|||||||
get() = GradleVersionRequired.AtLeast("6.0")
|
get() = GradleVersionRequired.AtLeast("6.0")
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testAndroidMppSourceSets(): Unit = with(Project("new-mpp-android-source-sets", GradleVersionRequired.FOR_MPP_SUPPORT)) {
|
fun testAndroidMppSourceSets(): Unit = with(Project("new-mpp-android-source-sets")) {
|
||||||
build("sourceSets") {
|
build("sourceSets") {
|
||||||
assertSuccessful()
|
assertSuccessful()
|
||||||
|
|
||||||
@@ -473,7 +474,6 @@ open class KotlinAndroid32GradleIT : KotlinAndroid3GradleIT() {
|
|||||||
File inputFile = null
|
File inputFile = null
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Internal
|
|
||||||
Iterable<String> asArguments() {
|
Iterable<String> asArguments() {
|
||||||
// Read the arguments from a file, because changing them in a build script is treated as an
|
// Read the arguments from a file, because changing them in a build script is treated as an
|
||||||
// implementation change by Gradle:
|
// implementation change by Gradle:
|
||||||
@@ -863,54 +863,21 @@ fun getSomething() = 10
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testMultiplatformAndroidCompile() = with(Project("multiplatformAndroidProject")) {
|
|
||||||
setupWorkingDir()
|
|
||||||
|
|
||||||
if (androidGradlePluginVersion >= AGPVersion.v3_6_0) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check that the common module is not added to the deprecated configuration 'compile' (KT-23719):
|
|
||||||
gradleBuildScript("libAndroid").appendText(
|
|
||||||
"""${'\n'}
|
|
||||||
configurations.compile.dependencies.all { aDependencyExists ->
|
|
||||||
throw GradleException("Check failed")
|
|
||||||
}
|
|
||||||
""".trimIndent()
|
|
||||||
)
|
|
||||||
|
|
||||||
build("build") {
|
|
||||||
assertSuccessful()
|
|
||||||
assertTasksExecuted(
|
|
||||||
":lib:compileKotlinCommon",
|
|
||||||
":lib:compileTestKotlinCommon",
|
|
||||||
":libJvm:compileKotlin",
|
|
||||||
":libJvm:compileTestKotlin",
|
|
||||||
":libAndroid:compileDebugKotlin",
|
|
||||||
":libAndroid:compileReleaseKotlin",
|
|
||||||
":libAndroid:compileDebugUnitTestKotlin",
|
|
||||||
":libAndroid:compileReleaseUnitTestKotlin"
|
|
||||||
)
|
|
||||||
|
|
||||||
assertFileExists("lib/build/classes/kotlin/main/foo/PlatformClass.kotlin_metadata")
|
|
||||||
assertFileExists("lib/build/classes/kotlin/test/foo/PlatformTest.kotlin_metadata")
|
|
||||||
assertFileExists("libJvm/build/classes/kotlin/main/foo/PlatformClass.class")
|
|
||||||
assertFileExists("libJvm/build/classes/kotlin/test/foo/PlatformTest.class")
|
|
||||||
|
|
||||||
assertFileExists("libAndroid/build/tmp/kotlin-classes/debug/foo/PlatformClass.class")
|
|
||||||
assertFileExists("libAndroid/build/tmp/kotlin-classes/release/foo/PlatformClass.class")
|
|
||||||
assertFileExists("libAndroid/build/tmp/kotlin-classes/debugUnitTest/foo/PlatformTest.class")
|
|
||||||
assertFileExists("libAndroid/build/tmp/kotlin-classes/debugUnitTest/foo/PlatformTest.class")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testDetectAndroidJava8() = with(Project("AndroidProject")) {
|
fun testDetectAndroidJava8() = with(Project("AndroidProject")) {
|
||||||
setupWorkingDir()
|
setupWorkingDir()
|
||||||
|
|
||||||
val kotlinJvmTarget18Regex = Regex("Kotlin compiler args: .* -jvm-target 1.8")
|
val kotlinJvmTarget18Regex = Regex("Kotlin compiler args: .* -jvm-target 1.8")
|
||||||
|
|
||||||
|
gradleBuildScript("Lib").appendText(
|
||||||
|
"\n" + """
|
||||||
|
android.compileOptions {
|
||||||
|
sourceCompatibility JavaVersion.VERSION_1_6
|
||||||
|
targetCompatibility JavaVersion.VERSION_1_6
|
||||||
|
}
|
||||||
|
""".trimIndent()
|
||||||
|
)
|
||||||
|
|
||||||
build(":Lib:assembleDebug", "-Pkotlin.setJvmTargetFromAndroidCompileOptions=true") {
|
build(":Lib:assembleDebug", "-Pkotlin.setJvmTargetFromAndroidCompileOptions=true") {
|
||||||
assertSuccessful()
|
assertSuccessful()
|
||||||
assertNotContains(kotlinJvmTarget18Regex)
|
assertNotContains(kotlinJvmTarget18Regex)
|
||||||
|
|||||||
+5
-5
@@ -40,11 +40,11 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
compile 'com.android.support:appcompat-v7:23.1.1'
|
implementation 'com.android.support:appcompat-v7:23.1.1'
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
|
||||||
compile 'com.google.dagger:dagger:2.0.1'
|
implementation 'com.google.dagger:dagger:2.0.1'
|
||||||
kapt 'com.google.dagger:dagger-compiler:2.0'
|
kapt 'com.google.dagger:dagger-compiler:2.0'
|
||||||
provided 'org.glassfish:javax.annotation:10.0-b28'
|
compileOnly 'org.glassfish:javax.annotation:10.0-b28'
|
||||||
}
|
}
|
||||||
+2
-2
@@ -45,6 +45,6 @@ androidExtensions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -19,6 +19,6 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
+2
-2
@@ -24,8 +24,8 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
androidExtensions {
|
androidExtensions {
|
||||||
|
|||||||
+3
-3
@@ -3,13 +3,13 @@ apply plugin: 'kotlin-android'
|
|||||||
apply plugin: 'kotlin-kapt'
|
apply plugin: 'kotlin-kapt'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "frankiesardo:icepick:3.2.0"
|
implementation "frankiesardo:icepick:3.2.0"
|
||||||
kapt "frankiesardo:icepick-processor:3.2.0"
|
kapt "frankiesardo:icepick-processor:3.2.0"
|
||||||
|
|
||||||
compile 'org.parceler:parceler-api:1.1.5'
|
implementation 'org.parceler:parceler-api:1.1.5'
|
||||||
kapt 'org.parceler:parceler:1.1.5'
|
kapt 'org.parceler:parceler:1.1.5'
|
||||||
|
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
|||||||
+4
-4
@@ -17,8 +17,8 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile project(":libJvmClassesOnly")
|
implementation project(":libJvmClassesOnly")
|
||||||
compile project(":libAndroid")
|
implementation project(":libAndroid")
|
||||||
compile project(":libAndroidClassesOnly")
|
implementation project(":libAndroidClassesOnly")
|
||||||
}
|
}
|
||||||
+1
-1
@@ -16,5 +16,5 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
+1
-1
@@ -16,5 +16,5 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
+2
-2
@@ -44,6 +44,6 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile 'com.android.support:appcompat-v7:23.1.1'
|
implementation 'com.android.support:appcompat-v7:23.1.1'
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
+3
-3
@@ -2,9 +2,9 @@ apply plugin: 'com.android.application'
|
|||||||
apply plugin: 'kotlin-android'
|
apply plugin: 'kotlin-android'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':Lib')
|
implementation project(':Lib')
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
testCompile 'junit:junit:4.12'
|
testImplementation'junit:junit:4.12'
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
|||||||
+3
-3
@@ -2,10 +2,10 @@ apply plugin: 'com.android.library'
|
|||||||
apply plugin: 'kotlin-android'
|
apply plugin: 'kotlin-android'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile files('libs/android-support-v4.jar')
|
implementation files('libs/android-support-v4.jar')
|
||||||
// unused but needed for IncrementalCompilationMultiProjectIT.testAndroid to check if non-local dependency affects IC
|
// unused but needed for IncrementalCompilationMultiProjectIT.testAndroid to check if non-local dependency affects IC
|
||||||
compile 'io.reactivex:rxjava:1.1.9'
|
implementation 'io.reactivex:rxjava:1.1.9'
|
||||||
compile 'com.loopj.android:android-async-http:1.4.9'
|
implementation 'com.loopj.android:android-async-http:1.4.9'
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
|||||||
+1
-1
@@ -14,7 +14,7 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':lib-a')
|
implementation project(':lib-a')
|
||||||
kapt "com.squareup.dagger:dagger-compiler:$dagger_version"
|
kapt "com.squareup.dagger:dagger-compiler:$dagger_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -18,7 +18,7 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':aaa')
|
implementation project(':aaa')
|
||||||
kapt "com.squareup.dagger:dagger-compiler:$dagger_version"
|
kapt "com.squareup.dagger:dagger-compiler:$dagger_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -14,7 +14,7 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "com.android.support:appcompat-v7:$support_lib_version"
|
implementation "com.android.support:appcompat-v7:$support_lib_version"
|
||||||
kapt "com.squareup.dagger:dagger-compiler:$dagger_version"
|
kapt "com.squareup.dagger:dagger-compiler:$dagger_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -25,5 +25,5 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -24,7 +24,7 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile "org.jetbrains.kotlin:kotlin-android-extensions-runtime:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-android-extensions-runtime:$kotlin_version"
|
||||||
}
|
}
|
||||||
+3
-3
@@ -58,11 +58,11 @@ if (VersionNumber.parse(android_tools_version) < VersionNumber.parse("3.0.0-alph
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(":Lib")
|
implementation project(":Lib")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
testCompile 'junit:junit:4.12'
|
testImplementation'junit:junit:4.12'
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-4
@@ -2,11 +2,11 @@ apply plugin: 'com.android.library'
|
|||||||
apply plugin: 'kotlin-android'
|
apply plugin: 'kotlin-android'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile files('libs/android-support-v4.jar')
|
implementation files('libs/android-support-v4.jar')
|
||||||
// unused but needed for IncrementalCompilationMultiProjectIT.testAndroid to check if non-local dependency affects IC
|
// unused but needed for IncrementalCompilationMultiProjectIT.testAndroid to check if non-local dependency affects IC
|
||||||
compile 'io.reactivex:rxjava:1.1.9'
|
implementation 'io.reactivex:rxjava:1.1.9'
|
||||||
compile 'com.loopj.android:android-async-http:1.4.9'
|
implementation 'com.loopj.android:android-async-http:1.4.9'
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ apply plugin: 'com.android.test'
|
|||||||
apply plugin: 'kotlin-android'
|
apply plugin: 'kotlin-android'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
|||||||
+3
-3
@@ -25,9 +25,9 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile 'com.google.guava:guava:12.0'
|
implementation 'com.google.guava:guava:12.0'
|
||||||
testCompile 'org.testng:testng:6.8'
|
testImplementation'org.testng:testng:6.8'
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
|
|||||||
+1
-1
@@ -11,5 +11,5 @@ allOpen {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
+1
-1
@@ -22,5 +22,5 @@ allOpen {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
+1
-1
@@ -26,5 +26,5 @@ allOpen {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
+1
-1
@@ -22,5 +22,5 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
+1
-1
@@ -22,5 +22,5 @@ kotlin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
+1
-1
@@ -24,7 +24,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
compileKotlin {
|
compileKotlin {
|
||||||
|
|||||||
+3
-3
@@ -26,9 +26,9 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile 'com.google.guava:guava:12.0'
|
implementation 'com.google.guava:guava:12.0'
|
||||||
testCompile 'org.testng:testng:6.8'
|
testImplementation'org.testng:testng:6.8'
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
|
|||||||
+2
-2
@@ -17,8 +17,8 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
testCompile 'junit:junit:4.12'
|
testImplementation'junit:junit:4.12'
|
||||||
}
|
}
|
||||||
|
|
||||||
// important to test that destinationDir is configured before evaluation
|
// important to test that destinationDir is configured before evaluation
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@ repositories {
|
|||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
||||||
testCompile 'junit:junit:4.12'
|
testImplementation'junit:junit:4.12'
|
||||||
compile project(":lib")
|
compile project(":lib")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -17,10 +17,10 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
||||||
testCompile 'junit:junit:4.12'
|
testImplementation'junit:junit:4.12'
|
||||||
compile project(path: ":lib", configuration: "proguarded")
|
implementation project(path: ":lib", configuration: "proguarded")
|
||||||
}
|
}
|
||||||
|
|
||||||
compileKotlin {
|
compileKotlin {
|
||||||
|
|||||||
+4
-4
@@ -27,10 +27,10 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
|
|
||||||
compile 'com.android.support:appcompat-v7:23.3.0'
|
implementation 'com.android.support:appcompat-v7:23.3.0'
|
||||||
compile 'com.jakewharton:butterknife:8.0.1'
|
implementation 'com.jakewharton:butterknife:8.0.1'
|
||||||
kapt 'com.jakewharton:butterknife-compiler:8.0.1'
|
kapt 'com.jakewharton:butterknife-compiler:8.0.1'
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
+5
-5
@@ -26,11 +26,11 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
compile 'com.android.support:appcompat-v7:23.3.0'
|
implementation 'com.android.support:appcompat-v7:23.3.0'
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
|
||||||
compile 'com.google.dagger:dagger:2.6.1'
|
implementation 'com.google.dagger:dagger:2.6.1'
|
||||||
kapt 'com.google.dagger:dagger-compiler:2.6.1'
|
kapt 'com.google.dagger:dagger-compiler:2.6.1'
|
||||||
provided 'org.glassfish:javax.annotation:10.0-b28'
|
compileOnly 'org.glassfish:javax.annotation:10.0-b28'
|
||||||
}
|
}
|
||||||
+4
-4
@@ -25,10 +25,10 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
kapt "com.android.databinding:compiler:$android_tools_version"
|
kapt "com.android.databinding:compiler:$android_tools_version"
|
||||||
kaptAndroidTest "junit:junit:4.12"
|
kaptAndroidTest "junit:junit:4.12"
|
||||||
compile 'com.android.support.constraint:constraint-layout:1.0.2'
|
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
|
||||||
testCompile 'junit:junit:4.12'
|
testImplementation'junit:junit:4.12'
|
||||||
}
|
}
|
||||||
+7
-7
@@ -22,17 +22,17 @@ def dbflow_version = "3.1.1"
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// Android Support Libraries
|
// Android Support Libraries
|
||||||
compile 'com.android.support:appcompat-v7:23.3.0'
|
implementation 'com.android.support:appcompat-v7:23.3.0'
|
||||||
compile 'com.android.support:cardview-v7:23.3.0'
|
implementation 'com.android.support:cardview-v7:23.3.0'
|
||||||
compile 'com.android.support:recyclerview-v7:23.3.0'
|
implementation 'com.android.support:recyclerview-v7:23.3.0'
|
||||||
|
|
||||||
// DBFlow
|
// DBFlow
|
||||||
kapt "com.github.Raizlabs.DBFlow:dbflow-processor:${dbflow_version}"
|
kapt "com.github.Raizlabs.DBFlow:dbflow-processor:${dbflow_version}"
|
||||||
compile "com.github.Raizlabs.DBFlow:dbflow-core:${dbflow_version}"
|
implementation "com.github.Raizlabs.DBFlow:dbflow-core:${dbflow_version}"
|
||||||
compile "com.github.Raizlabs.DBFlow:dbflow:${dbflow_version}"
|
implementation "com.github.Raizlabs.DBFlow:dbflow:${dbflow_version}"
|
||||||
compile "com.github.Raizlabs.DBFlow:dbflow-kotlinextensions:${dbflow_version}"
|
implementation "com.github.Raizlabs.DBFlow:dbflow-kotlinextensions:${dbflow_version}"
|
||||||
|
|
||||||
// Kotlin
|
// Kotlin
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
|
||||||
}
|
}
|
||||||
+6
-6
@@ -17,12 +17,12 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
|
|
||||||
compile 'com.android.support:appcompat-v7:23.3.0'
|
implementation 'com.android.support:appcompat-v7:23.3.0'
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile project(':lib-android')
|
implementation project(':lib-android')
|
||||||
compile project(':lib-jvm')
|
implementation project(':lib-jvm')
|
||||||
compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
}
|
}
|
||||||
+1
-1
@@ -14,5 +14,5 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
+3
-3
@@ -66,7 +66,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
||||||
compile 'org.jetbrains.anko:anko-common:0.9'
|
implementation 'org.jetbrains.anko:anko-common:0.9'
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -22,7 +22,7 @@ kapt {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
kapt "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
kapt "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
}
|
}
|
||||||
+2
-2
@@ -17,8 +17,8 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -19,7 +19,7 @@ allprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile project(":processor")
|
implementation project(":processor")
|
||||||
kapt project(":processor")
|
kapt project(":processor")
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -3,7 +3,7 @@ apply plugin: 'kotlin'
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
ext.autoServiceVersion = '1.0-rc2'
|
ext.autoServiceVersion = '1.0-rc2'
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile "com.google.auto.service:auto-service:$autoServiceVersion"
|
implementation "com.google.auto.service:auto-service:$autoServiceVersion"
|
||||||
kapt "com.google.auto.service:auto-service:$autoServiceVersion"
|
kapt "com.google.auto.service:auto-service:$autoServiceVersion"
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -18,7 +18,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
}
|
}
|
||||||
+1
-1
@@ -41,6 +41,6 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
kapt "com.android.databinding:compiler:$android_tools_version"
|
kapt "com.android.databinding:compiler:$android_tools_version"
|
||||||
}
|
}
|
||||||
+2
-2
@@ -18,7 +18,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile 'com.google.dagger:dagger:2.14.1'
|
implementation 'com.google.dagger:dagger:2.14.1'
|
||||||
kapt 'com.google.dagger:dagger-compiler:2.14.1'
|
kapt 'com.google.dagger:dagger-compiler:2.14.1'
|
||||||
}
|
}
|
||||||
+2
-2
@@ -18,7 +18,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
}
|
}
|
||||||
+2
-2
@@ -2,7 +2,7 @@ apply plugin: "kotlin"
|
|||||||
apply plugin: "kotlin-kapt"
|
apply plugin: "kotlin-kapt"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
}
|
}
|
||||||
+3
-3
@@ -2,8 +2,8 @@ apply plugin: "kotlin"
|
|||||||
apply plugin: "kotlin-kapt"
|
apply plugin: "kotlin-kapt"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(":module1")
|
implementation project(":module1")
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
}
|
}
|
||||||
+2
-2
@@ -17,8 +17,8 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -18,5 +18,5 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
+4
-4
@@ -23,11 +23,11 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
|
||||||
compile 'com.google.dagger:dagger:2.8'
|
implementation 'com.google.dagger:dagger:2.8'
|
||||||
kapt 'com.google.dagger:dagger-compiler:2.8'
|
kapt 'com.google.dagger:dagger-compiler:2.8'
|
||||||
|
|
||||||
compile 'com.android.support:appcompat-v7:23.3.0'
|
implementation 'com.android.support:appcompat-v7:23.3.0'
|
||||||
}
|
}
|
||||||
+2
-2
@@ -2,8 +2,8 @@ apply plugin: 'kotlin'
|
|||||||
apply plugin: 'kotlin-kapt'
|
apply plugin: 'kotlin-kapt'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
||||||
|
|
||||||
compile 'com.google.dagger:dagger:2.9'
|
implementation 'com.google.dagger:dagger:2.9'
|
||||||
kapt 'com.google.dagger:dagger-compiler:2.9'
|
kapt 'com.google.dagger:dagger-compiler:2.9'
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -2,5 +2,5 @@ apply plugin: 'kotlin'
|
|||||||
apply plugin: 'java-library'
|
apply plugin: 'java-library'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -2,7 +2,7 @@ apply plugin: 'kotlin'
|
|||||||
apply plugin: 'kotlin-kapt'
|
apply plugin: 'kotlin-kapt'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile project(':api')
|
implementation project(':api')
|
||||||
kapt project(':processor')
|
kapt project(':processor')
|
||||||
}
|
}
|
||||||
+3
-3
@@ -2,8 +2,8 @@ apply plugin: 'kotlin'
|
|||||||
apply plugin: 'kotlin-kapt'
|
apply plugin: 'kotlin-kapt'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile 'com.google.auto.service:auto-service:1.0-rc3'
|
implementation 'com.google.auto.service:auto-service:1.0-rc3'
|
||||||
kapt 'com.google.auto.service:auto-service:1.0-rc3'
|
kapt 'com.google.auto.service:auto-service:1.0-rc3'
|
||||||
compile project(':api')
|
implementation project(':api')
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile 'com.github.yanex:takenoko:0.1'
|
implementation 'com.github.yanex:takenoko:0.1'
|
||||||
}
|
}
|
||||||
+4
-4
@@ -2,14 +2,14 @@ apply plugin: 'kotlin'
|
|||||||
apply plugin: 'kotlin-kapt'
|
apply plugin: 'kotlin-kapt'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
|
||||||
compile project(":annotation-processor")
|
implementation project(":annotation-processor")
|
||||||
kapt project(":annotation-processor")
|
kapt project(":annotation-processor")
|
||||||
|
|
||||||
compile files("a")
|
implementation files("a")
|
||||||
|
|
||||||
testCompile 'junit:junit:4.12'
|
testImplementation'junit:junit:4.12'
|
||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'idea'
|
apply plugin: 'idea'
|
||||||
|
|||||||
+3
-3
@@ -18,10 +18,10 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
testCompile 'junit:junit:4.12'
|
testImplementation'junit:junit:4.12'
|
||||||
}
|
}
|
||||||
|
|
||||||
kapt {
|
kapt {
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
apply plugin: 'org.jetbrains.kotlin.platform.common'
|
apply plugin: 'org.jetbrains.kotlin.platform.common'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile deps.kotlin.stdlib.common
|
implementation deps.kotlin.stdlib.common
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -17,10 +17,10 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
|
||||||
testCompile 'junit:junit:4.12'
|
testImplementation'junit:junit:4.12'
|
||||||
}
|
}
|
||||||
|
|
||||||
compileKotlin.kotlinOptions.allWarningsAsErrors = true
|
compileKotlin.kotlinOptions.allWarningsAsErrors = true
|
||||||
+2
-2
@@ -1,8 +1,8 @@
|
|||||||
apply plugin: 'kotlin2js'
|
apply plugin: 'kotlin2js'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
||||||
compile project(":lib")
|
implementation project(":lib")
|
||||||
}
|
}
|
||||||
|
|
||||||
def isIrBackend = project.findProperty("kotlin.js.useIrBackend")?.toBoolean() ?: false
|
def isIrBackend = project.findProperty("kotlin.js.useIrBackend")?.toBoolean() ?: false
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
apply plugin: 'kotlin2js'
|
apply plugin: 'kotlin2js'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
def isIrBackend = project.findProperty("kotlin.js.useIrBackend")?.toBoolean() ?: false
|
def isIrBackend = project.findProperty("kotlin.js.useIrBackend")?.toBoolean() ?: false
|
||||||
|
|||||||
+3
-3
@@ -16,8 +16,8 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
||||||
compile "org.mozilla:rhino:1.7.7.1"
|
implementation "org.mozilla:rhino:1.7.7.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
def classesDir = "${buildDir}/classes/kotlin"
|
def classesDir = "${buildDir}/classes/kotlin"
|
||||||
@@ -41,7 +41,7 @@ task runRhino(type: JavaExec) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
build.doLast {
|
build.doLast {
|
||||||
configurations.compile.each { File file ->
|
configurations.compileClasspath.each { File file ->
|
||||||
copy {
|
copy {
|
||||||
includeEmptyDirs = false
|
includeEmptyDirs = false
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -23,5 +23,5 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
||||||
}
|
}
|
||||||
+3
-3
@@ -26,8 +26,8 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
||||||
compile "org.mozilla:rhino:1.7.7.1"
|
implementation "org.mozilla:rhino:1.7.7.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
task runRhino(type: JavaExec) {
|
task runRhino(type: JavaExec) {
|
||||||
@@ -38,7 +38,7 @@ task runRhino(type: JavaExec) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
build.doLast {
|
build.doLast {
|
||||||
configurations.compile.each { File file ->
|
configurations.compileClasspath.each { File file ->
|
||||||
copy {
|
copy {
|
||||||
includeEmptyDirs = false
|
includeEmptyDirs = false
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -16,7 +16,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
task jarSources(type: Jar) {
|
task jarSources(type: Jar) {
|
||||||
@@ -24,7 +24,7 @@ task jarSources(type: Jar) {
|
|||||||
classifier = 'source'
|
classifier = 'source'
|
||||||
}
|
}
|
||||||
artifacts {
|
artifacts {
|
||||||
compile jarSources
|
implementation jarSources
|
||||||
}
|
}
|
||||||
|
|
||||||
def outDir = "${buildDir}/kotlin2js/main/"
|
def outDir = "${buildDir}/kotlin2js/main/"
|
||||||
|
|||||||
+2
-2
@@ -16,8 +16,8 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(":libraryProject")
|
implementation project(":libraryProject")
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
compileKotlin2Js.kotlinOptions.sourceMap = true
|
compileKotlin2Js.kotlinOptions.sourceMap = true
|
||||||
|
|||||||
+2
-2
@@ -36,7 +36,7 @@ if (isIrBackend) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
||||||
integrationTestCompile files(file(compileKotlin2Js.kotlinOptions.outputFile).parent)
|
integrationTestCompile files(file(compileKotlin2Js.kotlinOptions.outputFile).parent)
|
||||||
integrationTestCompile "org.jetbrains.kotlin:kotlin-test-js:$kotlin_version"
|
integrationTestCompile "org.jetbrains.kotlin:kotlin-test-js:$kotlin_version"
|
||||||
}
|
}
|
||||||
@@ -53,5 +53,5 @@ task jarSources(type: Jar) {
|
|||||||
classifier = 'source'
|
classifier = 'source'
|
||||||
}
|
}
|
||||||
artifacts {
|
artifacts {
|
||||||
compile jarSources
|
implementation jarSources
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -18,7 +18,7 @@ allprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
compileKotlin2Js {
|
compileKotlin2Js {
|
||||||
@@ -31,7 +31,7 @@ allprojects {
|
|||||||
|
|
||||||
project("app") {
|
project("app") {
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(":lib")
|
implementation project(":lib")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -16,8 +16,8 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
||||||
testCompile "org.jetbrains.kotlin:kotlin-test-js:$kotlin_version"
|
testImplementation"org.jetbrains.kotlin:kotlin-test-js:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
task jarSources(type: Jar) {
|
task jarSources(type: Jar) {
|
||||||
@@ -25,7 +25,7 @@ task jarSources(type: Jar) {
|
|||||||
classifier = 'source'
|
classifier = 'source'
|
||||||
}
|
}
|
||||||
artifacts {
|
artifacts {
|
||||||
compile jarSources
|
implementation jarSources
|
||||||
}
|
}
|
||||||
|
|
||||||
compileKotlin2Js.kotlinOptions.outputFile = "${buildDir}/kotlin2js/main/module.js"
|
compileKotlin2Js.kotlinOptions.outputFile = "${buildDir}/kotlin2js/main/module.js"
|
||||||
|
|||||||
+1
-1
@@ -18,5 +18,5 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -24,7 +24,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
compileKotlin {
|
compileKotlin {
|
||||||
|
|||||||
-20
@@ -1,20 +0,0 @@
|
|||||||
buildscript {
|
|
||||||
repositories {
|
|
||||||
mavenLocal()
|
|
||||||
maven { url 'https://maven.google.com' }
|
|
||||||
jcenter()
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
|
||||||
classpath "com.android.tools.build:gradle:$android_tools_version"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
allprojects {
|
|
||||||
repositories {
|
|
||||||
mavenLocal()
|
|
||||||
maven { url 'https://maven.google.com' }
|
|
||||||
jcenter()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-5
@@ -1,5 +0,0 @@
|
|||||||
apply plugin: 'kotlin-platform-common'
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
|
||||||
}
|
|
||||||
-7
@@ -1,7 +0,0 @@
|
|||||||
package foo
|
|
||||||
|
|
||||||
expect class PlatformClass {
|
|
||||||
val value: String
|
|
||||||
}
|
|
||||||
|
|
||||||
class CommonClass
|
|
||||||
-7
@@ -1,7 +0,0 @@
|
|||||||
package foo
|
|
||||||
|
|
||||||
expect class PlatformTest {
|
|
||||||
val value: PlatformClass
|
|
||||||
}
|
|
||||||
|
|
||||||
class CommonTest(val commonClass: CommonClass)
|
|
||||||
-20
@@ -1,20 +0,0 @@
|
|||||||
apply plugin: 'com.android.application'
|
|
||||||
apply plugin: 'kotlin-platform-android'
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
expectedBy project(":lib")
|
|
||||||
}
|
|
||||||
|
|
||||||
android {
|
|
||||||
compileSdkVersion 23
|
|
||||||
buildToolsVersion "25.0.2"
|
|
||||||
|
|
||||||
defaultConfig {
|
|
||||||
minSdkVersion 19
|
|
||||||
targetSdkVersion 23
|
|
||||||
versionCode 1
|
|
||||||
versionName "1.0"
|
|
||||||
}
|
|
||||||
|
|
||||||
lintOptions.abortOnError = false
|
|
||||||
}
|
|
||||||
-8
@@ -1,8 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
package="platform.kotlin.android.test"
|
|
||||||
>
|
|
||||||
|
|
||||||
<application/>
|
|
||||||
|
|
||||||
</manifest>
|
|
||||||
-5
@@ -1,5 +0,0 @@
|
|||||||
package foo
|
|
||||||
|
|
||||||
actual class PlatformClass {
|
|
||||||
actual val value: String = "Android"
|
|
||||||
}
|
|
||||||
-8
@@ -1,8 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2000-2018 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 platform.kotlin.android.test
|
|
||||||
|
|
||||||
class MyActivity: android.app.Activity()
|
|
||||||
-5
@@ -1,5 +0,0 @@
|
|||||||
package foo
|
|
||||||
|
|
||||||
actual class PlatformTest {
|
|
||||||
actual val value: PlatformClass = PlatformClass()
|
|
||||||
}
|
|
||||||
-7
@@ -1,7 +0,0 @@
|
|||||||
apply plugin: 'kotlin-platform-jvm'
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
expectedBy project(":lib")
|
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
|
||||||
compile 'com.google.guava:guava:20.0'
|
|
||||||
}
|
|
||||||
-5
@@ -1,5 +0,0 @@
|
|||||||
package foo
|
|
||||||
|
|
||||||
actual class PlatformClass {
|
|
||||||
actual val value: String = "JVM"
|
|
||||||
}
|
|
||||||
-7
@@ -1,7 +0,0 @@
|
|||||||
package foo
|
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableSet
|
|
||||||
|
|
||||||
fun main(args: Array<String>) {
|
|
||||||
val colors = ImmutableSet.of("red", "orange", "yellow")
|
|
||||||
}
|
|
||||||
-5
@@ -1,5 +0,0 @@
|
|||||||
package foo
|
|
||||||
|
|
||||||
actual class PlatformTest {
|
|
||||||
actual val value: PlatformClass = PlatformClass()
|
|
||||||
}
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
include ':lib', ':libJvm', ':libAndroid'
|
|
||||||
+2
-2
@@ -3,6 +3,6 @@ apply plugin: 'kotlin-platform-jvm'
|
|||||||
dependencies {
|
dependencies {
|
||||||
expectedBy project(":libA")
|
expectedBy project(":libA")
|
||||||
expectedBy project(":libB")
|
expectedBy project(":libB")
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile 'com.google.guava:guava:20.0'
|
implementation 'com.google.guava:guava:20.0'
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -22,5 +22,5 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
+1
-1
@@ -26,5 +26,5 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
+1
-1
@@ -26,5 +26,5 @@ samWithReceiver {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
+4
-4
@@ -17,10 +17,10 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
||||||
testCompile 'junit:junit:4.12'
|
testImplementation'junit:junit:4.12'
|
||||||
compile project(":lib")
|
implementation project(":lib")
|
||||||
}
|
}
|
||||||
|
|
||||||
compileKotlin {
|
compileKotlin {
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':script-template')
|
implementation project(':script-template')
|
||||||
}
|
}
|
||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile "org.jetbrains.kotlin:kotlin-scripting-common:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-scripting-common:$kotlin_version"
|
||||||
}
|
}
|
||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':script-template')
|
implementation project(':script-template')
|
||||||
kotlinScriptDef project(':script-template')
|
kotlinScriptDef project(':script-template')
|
||||||
}
|
}
|
||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile "org.jetbrains.kotlin:kotlin-scripting-common:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-scripting-common:$kotlin_version"
|
||||||
}
|
}
|
||||||
+1
-1
@@ -21,7 +21,7 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
|||||||
Reference in New Issue
Block a user