diff --git a/samples/calculator/androidApp/build.gradle b/samples/calculator/androidApp/build.gradle index 0b2d6982af3..fd886631591 100644 --- a/samples/calculator/androidApp/build.gradle +++ b/samples/calculator/androidApp/build.gradle @@ -14,7 +14,7 @@ buildscript { } apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' +apply plugin: 'kotlin-platform-android' android { compileSdkVersion 27 @@ -25,11 +25,6 @@ android { versionCode 1 versionName "1.0.0" } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - main.java.srcDirs += '../parser/src/main/kotlin' - } } repositories { @@ -39,7 +34,7 @@ repositories { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" -// implementation "org.jetbrains.kotlin.konan.samples:arithmetic-parser" + expectedBy project(':parser') implementation "com.android.support:appcompat-v7:27.0.2" } diff --git a/samples/calculator/androidApp/settings.gradle b/samples/calculator/androidApp/settings.gradle index a557968a286..0ea2b164f53 100644 --- a/samples/calculator/androidApp/settings.gradle +++ b/samples/calculator/androidApp/settings.gradle @@ -1 +1,2 @@ -// includeBuild '../parser' +include ':parser' +project(':parser').projectDir = file('../parser')