From fc52f149655ee9b4fd3023dfa80fd1572a3f367e Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Mon, 2 Apr 2018 19:52:48 +0700 Subject: [PATCH] [samples] Update calculator sample structure --- samples/androidNativeActivity/build.gradle | 4 +-- .../androidNativeActivity/gradle.properties | 1 + .../{androidApp => android}/build.gradle | 4 +-- .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../{androidApp => android}/gradlew | 0 .../{androidApp => android}/gradlew.bat | 0 samples/calculator/android/settings.gradle | 2 ++ .../src/main/AndroidManifest.xml | 0 .../org/konan/calculator/MainActivity.kt | 0 .../drawable-v24/ic_launcher_foreground.xml | 0 .../res/drawable/ic_launcher_background.xml | 0 .../src/main/res/layout/activity_main.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-hdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../src/main/res/values/colors.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 samples/calculator/androidApp/settings.gradle | 2 -- samples/calculator/build.gradle | 16 +++-------- .../{parser => common}/build.gradle | 0 .../org/konan/arithmeticparser/Parser.kt | 0 samples/calculator/ios/build.gradle | 25 ++++++++++++++++++ .../calculator.xcodeproj/project.pbxproj | 4 +-- .../contents.xcworkspacedata | 0 .../{ => ios}/calculator/AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../Base.lproj/LaunchScreen.storyboard | 0 .../calculator/Base.lproj/Main.storyboard | 0 .../{ => ios}/calculator/Info.plist | 0 .../{ => ios}/calculator/ViewController.swift | 0 samples/calculator/ios/gradle.properties | 1 + .../{jvmCliApp => jvm}/build.gradle | 2 +- .../kotlin/org/konan/calculator/JvmCli.kt | 0 .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/settings.gradle | 8 +++--- 46 files changed, 47 insertions(+), 26 deletions(-) rename samples/calculator/{androidApp => android}/build.gradle (88%) rename samples/calculator/{androidApp => android}/gradle/wrapper/gradle-wrapper.jar (100%) rename samples/calculator/{androidApp => android}/gradle/wrapper/gradle-wrapper.properties (93%) rename samples/calculator/{androidApp => android}/gradlew (100%) rename samples/calculator/{androidApp => android}/gradlew.bat (100%) create mode 100644 samples/calculator/android/settings.gradle rename samples/calculator/{androidApp => android}/src/main/AndroidManifest.xml (100%) rename samples/calculator/{androidApp => android}/src/main/kotlin/org/konan/calculator/MainActivity.kt (100%) rename samples/calculator/{androidApp => android}/src/main/res/drawable-v24/ic_launcher_foreground.xml (100%) rename samples/calculator/{androidApp => android}/src/main/res/drawable/ic_launcher_background.xml (100%) rename samples/calculator/{androidApp => android}/src/main/res/layout/activity_main.xml (100%) rename samples/calculator/{androidApp => android}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename samples/calculator/{androidApp => android}/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename samples/calculator/{androidApp => android}/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename samples/calculator/{androidApp => android}/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%) rename samples/calculator/{androidApp => android}/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename samples/calculator/{androidApp => android}/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%) rename samples/calculator/{androidApp => android}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename samples/calculator/{androidApp => android}/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename samples/calculator/{androidApp => android}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename samples/calculator/{androidApp => android}/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename samples/calculator/{androidApp => android}/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename samples/calculator/{androidApp => android}/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename samples/calculator/{androidApp => android}/src/main/res/values/colors.xml (100%) rename samples/calculator/{androidApp => android}/src/main/res/values/strings.xml (100%) rename samples/calculator/{androidApp => android}/src/main/res/values/styles.xml (100%) delete mode 100644 samples/calculator/androidApp/settings.gradle rename samples/calculator/{parser => common}/build.gradle (100%) rename samples/calculator/{parser => common}/src/main/kotlin/org/konan/arithmeticparser/Parser.kt (100%) create mode 100644 samples/calculator/ios/build.gradle rename samples/calculator/{ => ios}/calculator.xcodeproj/project.pbxproj (99%) rename samples/calculator/{ => ios}/calculator.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename samples/calculator/{ => ios}/calculator/AppDelegate.swift (100%) rename samples/calculator/{ => ios}/calculator/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename samples/calculator/{ => ios}/calculator/Base.lproj/LaunchScreen.storyboard (100%) rename samples/calculator/{ => ios}/calculator/Base.lproj/Main.storyboard (100%) rename samples/calculator/{ => ios}/calculator/Info.plist (100%) rename samples/calculator/{ => ios}/calculator/ViewController.swift (100%) create mode 100644 samples/calculator/ios/gradle.properties rename samples/calculator/{jvmCliApp => jvm}/build.gradle (91%) rename samples/calculator/{jvmCliApp => jvm}/src/main/kotlin/org/konan/calculator/JvmCli.kt (100%) diff --git a/samples/androidNativeActivity/build.gradle b/samples/androidNativeActivity/build.gradle index c9da5b50a4a..268786584a1 100644 --- a/samples/androidNativeActivity/build.gradle +++ b/samples/androidNativeActivity/build.gradle @@ -8,8 +8,8 @@ buildscript { } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:+" - classpath "com.android.tools.build:gradle:3.0.1" + classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:${project.property('konan.plugin.version')}" + classpath "com.android.tools.build:gradle:3.1.0" } } diff --git a/samples/androidNativeActivity/gradle.properties b/samples/androidNativeActivity/gradle.properties index 196f4b3055e..1a26c3ce51c 100644 --- a/samples/androidNativeActivity/gradle.properties +++ b/samples/androidNativeActivity/gradle.properties @@ -1 +1,2 @@ konan.home=../../dist +konan.plugin.version=+ diff --git a/samples/calculator/androidApp/build.gradle b/samples/calculator/android/build.gradle similarity index 88% rename from samples/calculator/androidApp/build.gradle rename to samples/calculator/android/build.gradle index a5e86bc6ee9..57fe0fbae45 100644 --- a/samples/calculator/androidApp/build.gradle +++ b/samples/calculator/android/build.gradle @@ -8,7 +8,7 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.0' } } @@ -33,7 +33,7 @@ repositories { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - expectedBy project(':parser') + expectedBy project(':common') implementation "com.android.support:appcompat-v7:27.0.2" } diff --git a/samples/calculator/androidApp/gradle/wrapper/gradle-wrapper.jar b/samples/calculator/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from samples/calculator/androidApp/gradle/wrapper/gradle-wrapper.jar rename to samples/calculator/android/gradle/wrapper/gradle-wrapper.jar diff --git a/samples/calculator/androidApp/gradle/wrapper/gradle-wrapper.properties b/samples/calculator/android/gradle/wrapper/gradle-wrapper.properties similarity index 93% rename from samples/calculator/androidApp/gradle/wrapper/gradle-wrapper.properties rename to samples/calculator/android/gradle/wrapper/gradle-wrapper.properties index e2ce1431802..05c8d256bff 100644 --- a/samples/calculator/androidApp/gradle/wrapper/gradle-wrapper.properties +++ b/samples/calculator/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/samples/calculator/androidApp/gradlew b/samples/calculator/android/gradlew similarity index 100% rename from samples/calculator/androidApp/gradlew rename to samples/calculator/android/gradlew diff --git a/samples/calculator/androidApp/gradlew.bat b/samples/calculator/android/gradlew.bat similarity index 100% rename from samples/calculator/androidApp/gradlew.bat rename to samples/calculator/android/gradlew.bat diff --git a/samples/calculator/android/settings.gradle b/samples/calculator/android/settings.gradle new file mode 100644 index 00000000000..22057d26ee1 --- /dev/null +++ b/samples/calculator/android/settings.gradle @@ -0,0 +1,2 @@ +include ':common' +project(':common').projectDir = file('../common') diff --git a/samples/calculator/androidApp/src/main/AndroidManifest.xml b/samples/calculator/android/src/main/AndroidManifest.xml similarity index 100% rename from samples/calculator/androidApp/src/main/AndroidManifest.xml rename to samples/calculator/android/src/main/AndroidManifest.xml diff --git a/samples/calculator/androidApp/src/main/kotlin/org/konan/calculator/MainActivity.kt b/samples/calculator/android/src/main/kotlin/org/konan/calculator/MainActivity.kt similarity index 100% rename from samples/calculator/androidApp/src/main/kotlin/org/konan/calculator/MainActivity.kt rename to samples/calculator/android/src/main/kotlin/org/konan/calculator/MainActivity.kt diff --git a/samples/calculator/androidApp/src/main/res/drawable-v24/ic_launcher_foreground.xml b/samples/calculator/android/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from samples/calculator/androidApp/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to samples/calculator/android/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/samples/calculator/androidApp/src/main/res/drawable/ic_launcher_background.xml b/samples/calculator/android/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from samples/calculator/androidApp/src/main/res/drawable/ic_launcher_background.xml rename to samples/calculator/android/src/main/res/drawable/ic_launcher_background.xml diff --git a/samples/calculator/androidApp/src/main/res/layout/activity_main.xml b/samples/calculator/android/src/main/res/layout/activity_main.xml similarity index 100% rename from samples/calculator/androidApp/src/main/res/layout/activity_main.xml rename to samples/calculator/android/src/main/res/layout/activity_main.xml diff --git a/samples/calculator/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/samples/calculator/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from samples/calculator/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to samples/calculator/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/samples/calculator/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/samples/calculator/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from samples/calculator/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to samples/calculator/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/samples/calculator/androidApp/src/main/res/mipmap-hdpi/ic_launcher.png b/samples/calculator/android/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from samples/calculator/androidApp/src/main/res/mipmap-hdpi/ic_launcher.png rename to samples/calculator/android/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/samples/calculator/androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.png b/samples/calculator/android/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from samples/calculator/androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to samples/calculator/android/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/samples/calculator/androidApp/src/main/res/mipmap-mdpi/ic_launcher.png b/samples/calculator/android/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from samples/calculator/androidApp/src/main/res/mipmap-mdpi/ic_launcher.png rename to samples/calculator/android/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/samples/calculator/androidApp/src/main/res/mipmap-mdpi/ic_launcher_round.png b/samples/calculator/android/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from samples/calculator/androidApp/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to samples/calculator/android/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/samples/calculator/androidApp/src/main/res/mipmap-xhdpi/ic_launcher.png b/samples/calculator/android/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from samples/calculator/androidApp/src/main/res/mipmap-xhdpi/ic_launcher.png rename to samples/calculator/android/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/samples/calculator/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/samples/calculator/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from samples/calculator/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to samples/calculator/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/samples/calculator/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.png b/samples/calculator/android/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from samples/calculator/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to samples/calculator/android/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/samples/calculator/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/samples/calculator/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from samples/calculator/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to samples/calculator/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/samples/calculator/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/samples/calculator/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from samples/calculator/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to samples/calculator/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/samples/calculator/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/samples/calculator/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from samples/calculator/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to samples/calculator/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/samples/calculator/androidApp/src/main/res/values/colors.xml b/samples/calculator/android/src/main/res/values/colors.xml similarity index 100% rename from samples/calculator/androidApp/src/main/res/values/colors.xml rename to samples/calculator/android/src/main/res/values/colors.xml diff --git a/samples/calculator/androidApp/src/main/res/values/strings.xml b/samples/calculator/android/src/main/res/values/strings.xml similarity index 100% rename from samples/calculator/androidApp/src/main/res/values/strings.xml rename to samples/calculator/android/src/main/res/values/strings.xml diff --git a/samples/calculator/androidApp/src/main/res/values/styles.xml b/samples/calculator/android/src/main/res/values/styles.xml similarity index 100% rename from samples/calculator/androidApp/src/main/res/values/styles.xml rename to samples/calculator/android/src/main/res/values/styles.xml diff --git a/samples/calculator/androidApp/settings.gradle b/samples/calculator/androidApp/settings.gradle deleted file mode 100644 index 0ea2b164f53..00000000000 --- a/samples/calculator/androidApp/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -include ':parser' -project(':parser').projectDir = file('../parser') diff --git a/samples/calculator/build.gradle b/samples/calculator/build.gradle index 212ada062d1..04f02f0d103 100644 --- a/samples/calculator/build.gradle +++ b/samples/calculator/build.gradle @@ -1,13 +1,5 @@ -apply plugin: 'konan' - -konan.targets = ['iphone', 'iphone_sim'] - -konanArtifacts { - framework('KotlinArithmeticParser') { - enableMultiplatform true +task build { + subprojects.each { + dependsOn("${it.path}:build") } -} - -dependencies { - expectedBy project(':calculator:parser') -} +} \ No newline at end of file diff --git a/samples/calculator/parser/build.gradle b/samples/calculator/common/build.gradle similarity index 100% rename from samples/calculator/parser/build.gradle rename to samples/calculator/common/build.gradle diff --git a/samples/calculator/parser/src/main/kotlin/org/konan/arithmeticparser/Parser.kt b/samples/calculator/common/src/main/kotlin/org/konan/arithmeticparser/Parser.kt similarity index 100% rename from samples/calculator/parser/src/main/kotlin/org/konan/arithmeticparser/Parser.kt rename to samples/calculator/common/src/main/kotlin/org/konan/arithmeticparser/Parser.kt diff --git a/samples/calculator/ios/build.gradle b/samples/calculator/ios/build.gradle new file mode 100644 index 00000000000..e3a0044b7ac --- /dev/null +++ b/samples/calculator/ios/build.gradle @@ -0,0 +1,25 @@ +buildscript { + repositories { + mavenCentral() + maven { url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies" } + } + + dependencies { + classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:${project.property('konan.plugin.version')}" + } +} + +apply plugin: 'konan' + +konan.targets = ['iphone', 'iphone_sim'] + +konanArtifacts { + framework('KotlinArithmeticParser') { + enableMultiplatform true + } +} + +dependencies { + expectedBy project(':calculator:common') +} + diff --git a/samples/calculator/calculator.xcodeproj/project.pbxproj b/samples/calculator/ios/calculator.xcodeproj/project.pbxproj similarity index 99% rename from samples/calculator/calculator.xcodeproj/project.pbxproj rename to samples/calculator/ios/calculator.xcodeproj/project.pbxproj index 28408dc7288..168feecc311 100644 --- a/samples/calculator/calculator.xcodeproj/project.pbxproj +++ b/samples/calculator/ios/calculator.xcodeproj/project.pbxproj @@ -107,7 +107,7 @@ 7FF94AE52058485300590D0D /* main */, ); name = src; - path = parser/src; + path = ../common/src; sourceTree = SOURCE_ROOT; }; 7FF94AE52058485300590D0D /* main */ = { @@ -251,7 +251,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"$SRCROOT/../gradlew\" -p \"$SRCROOT\" \"$KONAN_TASK\" -Pkonan.useEnvironmentVariables=true"; + shellScript = "\"$SRCROOT/../../gradlew\" -p \"$SRCROOT\" \"$KONAN_TASK\" -Pkonan.useEnvironmentVariables=true"; }; /* End PBXShellScriptBuildPhase section */ diff --git a/samples/calculator/calculator.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/samples/calculator/ios/calculator.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from samples/calculator/calculator.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to samples/calculator/ios/calculator.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/samples/calculator/calculator/AppDelegate.swift b/samples/calculator/ios/calculator/AppDelegate.swift similarity index 100% rename from samples/calculator/calculator/AppDelegate.swift rename to samples/calculator/ios/calculator/AppDelegate.swift diff --git a/samples/calculator/calculator/Assets.xcassets/AppIcon.appiconset/Contents.json b/samples/calculator/ios/calculator/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from samples/calculator/calculator/Assets.xcassets/AppIcon.appiconset/Contents.json rename to samples/calculator/ios/calculator/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/samples/calculator/calculator/Base.lproj/LaunchScreen.storyboard b/samples/calculator/ios/calculator/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from samples/calculator/calculator/Base.lproj/LaunchScreen.storyboard rename to samples/calculator/ios/calculator/Base.lproj/LaunchScreen.storyboard diff --git a/samples/calculator/calculator/Base.lproj/Main.storyboard b/samples/calculator/ios/calculator/Base.lproj/Main.storyboard similarity index 100% rename from samples/calculator/calculator/Base.lproj/Main.storyboard rename to samples/calculator/ios/calculator/Base.lproj/Main.storyboard diff --git a/samples/calculator/calculator/Info.plist b/samples/calculator/ios/calculator/Info.plist similarity index 100% rename from samples/calculator/calculator/Info.plist rename to samples/calculator/ios/calculator/Info.plist diff --git a/samples/calculator/calculator/ViewController.swift b/samples/calculator/ios/calculator/ViewController.swift similarity index 100% rename from samples/calculator/calculator/ViewController.swift rename to samples/calculator/ios/calculator/ViewController.swift diff --git a/samples/calculator/ios/gradle.properties b/samples/calculator/ios/gradle.properties new file mode 100644 index 00000000000..1f78a75b3dc --- /dev/null +++ b/samples/calculator/ios/gradle.properties @@ -0,0 +1 @@ +konan.home=../../../dist \ No newline at end of file diff --git a/samples/calculator/jvmCliApp/build.gradle b/samples/calculator/jvm/build.gradle similarity index 91% rename from samples/calculator/jvmCliApp/build.gradle rename to samples/calculator/jvm/build.gradle index 317225f325b..c1e61bd74f6 100644 --- a/samples/calculator/jvmCliApp/build.gradle +++ b/samples/calculator/jvm/build.gradle @@ -19,7 +19,7 @@ repositories { dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - expectedBy project(":calculator:parser") + expectedBy project(":calculator:common") } applicationName = "KotlinCalculator" diff --git a/samples/calculator/jvmCliApp/src/main/kotlin/org/konan/calculator/JvmCli.kt b/samples/calculator/jvm/src/main/kotlin/org/konan/calculator/JvmCli.kt similarity index 100% rename from samples/calculator/jvmCliApp/src/main/kotlin/org/konan/calculator/JvmCli.kt rename to samples/calculator/jvm/src/main/kotlin/org/konan/calculator/JvmCli.kt diff --git a/samples/gradle/wrapper/gradle-wrapper.properties b/samples/gradle/wrapper/gradle-wrapper.properties index be280bec023..ea720f986f3 100644 --- a/samples/gradle/wrapper/gradle-wrapper.properties +++ b/samples/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip diff --git a/samples/settings.gradle b/samples/settings.gradle index 2634c77eaaa..8656dbe5705 100644 --- a/samples/settings.gradle +++ b/samples/settings.gradle @@ -1,8 +1,9 @@ // NOTE: If a new sample uses only platform libs, // please add it into the 'buildSamplesWithPlatfromLibs' task in build.gradle. include ':calculator' -include ':calculator:jvmCliApp' -include ':calculator:parser' +include ':calculator:common' +include ':calculator:jvm' +include ':calculator:ios' include ':csvparser' include ':gitchurn' include ':globalState' @@ -14,10 +15,11 @@ include ':socket' include ':tetris' include ':tensorflow' include ':torch' -// Android native activity build requires Android SDK. +// Android samples require Android SDK. // So temporary switching off for now, as it breaks the build // of other samples if SDK is not present. // include ':androidNativeActivity' +// include ':calculator:android' include ':objc' include ':uikit' include ':win32'