[samples] Update calculator sample structure

samples/androidNativeActivity/build.gradle

@@ -8,8 +8,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:+"
+        classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:${project.property('konan.plugin.version')}"
-        classpath "com.android.tools.build:gradle:3.0.1"
+        classpath "com.android.tools.build:gradle:3.1.0"
     }
 }
 

samples/androidNativeActivity/gradle.properties

@@ -1 +1,2 @@
 konan.home=../../dist
+konan.plugin.version=+

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"
 }

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

samples/calculator/android/settings.gradle

@@ -0,0 +1,2 @@
+include ':common'
+project(':common').projectDir = file('../common')

samples/calculator/androidApp/settings.gradle

@@ -1,2 +0,0 @@
-include ':parser'
-project(':parser').projectDir = file('../parser')

samples/calculator/build.gradle

@@ -1,13 +1,5 @@
-apply plugin: 'konan'
+task build {
-
+    subprojects.each {
-konan.targets = ['iphone', 'iphone_sim']
+        dependsOn("${it.path}:build")
-
-konanArtifacts {
-    framework('KotlinArithmeticParser') {
-        enableMultiplatform true
     }
-}
+}
-
-dependencies {
-    expectedBy project(':calculator:parser')
-}

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')
+}
+

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 */
 

samples/calculator/ios/gradle.properties

@@ -0,0 +1 @@
+konan.home=../../../dist

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"

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

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:common'
-include ':calculator:parser'
+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'