Merge pull request #3 from michalciolek/master

Update libraries and fix build

Author: fractalwrench

README.md

@@ -8,7 +8,8 @@ Check out the [blog post](https://www.bugsnag.com/blog/kotlin-multiplatform) for
 
 ### iOS
 
-`./gradlew build`, then run from XCode targetting a simulator in the Debug Configuration
+`xcodebuild -sdk iphonesimulator -arch arm64 -configuration Debug -project "ios-app/ios-app.xcodeproj" -scheme ios-app`
+then run from XCode targeting a simulator in the Debug Configuration
 
 ### Web
 

build.gradle.kts

@@ -10,7 +10,7 @@ buildscript {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
         classpath("com.android.tools.build:gradle:${Versions.agp}")
         classpath("com.bugsnag:bugsnag-android-gradle-plugin:${Versions.bugsnagPlugin}")
-        classpath("org.jetbrains.kotlin:kotlin-frontend-plugin:0.0.37")
+        classpath("org.jetbrains.kotlin:kotlin-frontend-plugin:${Versions.kotlinFrontentPlugin}")
     }
 }
 
@@ -23,4 +23,18 @@ allprojects {
         maven("https://dl.bintray.com/kotlin/kotlin-js-wrappers")
         maven("https://kotlin.bintray.com/kotlinx")
     }
+
+    // TODO remove once https://github.com/Kotlin/kotlin-frontend-plugin/issues/141 is fixed
+    plugins.whenPluginAdded {
+        if (this.javaClass.name == "org.jetbrains.kotlin.gradle.frontend.FrontendPlugin") {
+            val fixTask = tasks.register("webpack-config-fix") {
+                this.doLast { file("webpack.config.d").mkdir() }
+            }
+            afterEvaluate {
+                tasks.named("webpack-config").configure {
+                    this.dependsOn(fixTask)
+                }
+            }
+        }
+    }
 }

buildSrc/src/main/java/Versions.kt

@@ -1,10 +1,14 @@
 object Versions {
-    val kotlin = "1.3.20"
-    val agp = "3.2.1"
+    val kotlin = "1.3.41"
+    val kotlinxHtml = "0.6.12"
+    val kotlinReact = "16.9.0-pre.82-kotlin-1.3.41"
+    val nodeJs = "12.9.0"
+    val agp = "3.4.2"
     val androidx = "1.0.0"
     val bugsnagAndroid = "4.11.0"
     val bugsnagPlugin = "4.0.0"
     val bugsnagJvm = "3.4.4"
-    val springBoot = "2.1.1.RELEASE"
-    val depManagement = "1.0.6.RELEASE"
-}
+    val kotlinFrontentPlugin = "0.0.45"
+    val springBoot = "2.1.7.RELEASE"
+    val depManagement = "1.0.8.RELEASE"
+}

common/build.gradle

@@ -16,9 +16,12 @@ kotlin {
                 kotlinOptions.main = "call"
             }
         }
+        // This is for iPhone emulator
         // Switch here to iosArm64 (or iosArm32) to build library for iPhone device, rather than simulator
-        iosX64("ios") {
-            compilations.main.outputKinds("framework")
+        iosX64("ios"){
+            binaries {
+                framework()
+            }
         }
     }
 
@@ -44,3 +47,25 @@ kotlin {
 configurations {
     compileClasspath
 }
+
+// This task attaches native framework built from ios module to Xcode project
+// (see iosApp directory). Don't run this task directly,
+// Xcode runs this task itself during its build process.
+// Before opening the project from iosApp directory in Xcode,
+// make sure all Gradle infrastructure exists (gradle.wrapper, gradlew).
+task copyFramework {
+    def buildType = project.findProperty('kotlin.build.type') ?: 'DEBUG'
+    def target = project.findProperty('kotlin.target') ?: 'ios'
+    dependsOn kotlin.targets."$target".binaries.getFramework(buildType).linkTask
+
+    doLast {
+        def srcFile = kotlin.targets."$target".binaries.getFramework(buildType).outputFile
+        def targetDir = getProperty('configuration.build.dir')
+        copy {
+            from srcFile.parent
+            into targetDir
+            include 'common.framework/**'
+            include 'common.framework.dSYM'
+        }
+    }
+}

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.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip

ios-app/ios-app.xcodeproj/project.pbxproj

@@ -12,8 +12,6 @@
 		E7C9B7AE2201EE24001F5774 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E7C9B7AC2201EE24001F5774 /* Main.storyboard */; };
 		E7C9B7B02201EE27001F5774 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E7C9B7AF2201EE27001F5774 /* Assets.xcassets */; };
 		E7C9B7B32201EE27001F5774 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E7C9B7B12201EE27001F5774 /* LaunchScreen.storyboard */; };
-		E7C9B7C22201F4D7001F5774 /* main.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7C9B7C12201F4D7001F5774 /* main.framework */; };
-		E7C9B7C32201F4D7001F5774 /* main.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E7C9B7C12201F4D7001F5774 /* main.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -23,7 +21,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				E7C9B7C32201F4D7001F5774 /* main.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -38,17 +35,13 @@
 		E7C9B7AF2201EE27001F5774 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		E7C9B7B22201EE27001F5774 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		E7C9B7B42201EE27001F5774 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		E7C9B7BB2201F33C001F5774 /* main.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = main.framework; path = ../common/build/bin/ios/mainDebugFramework/main.framework; sourceTree = "<group>"; };
-		E7C9B7BD2201F4BF001F5774 /* main.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = main.framework; path = ../common/build/bin/ios/mainDebugFramework/main.framework; sourceTree = "<group>"; };
-		E7C9B7C12201F4D7001F5774 /* main.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = main.framework; path = ../common/build/bin/ios/mainDebugFramework/main.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		E7C9B7A22201EE24001F5774 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E7C9B7C22201F4D7001F5774 /* main.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -58,8 +51,6 @@
 		E7C9B79C2201EE24001F5774 = {
 			isa = PBXGroup;
 			children = (
-				E7C9B7BD2201F4BF001F5774 /* main.framework */,
-				E7C9B7C12201F4D7001F5774 /* main.framework */,
 				E7C9B7A72201EE24001F5774 /* ios-app */,
 				E7C9B7A62201EE24001F5774 /* Products */,
 				E7C9B7BA2201F33C001F5774 /* Frameworks */,
@@ -90,7 +81,6 @@
 		E7C9B7BA2201F33C001F5774 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				E7C9B7BB2201F33C001F5774 /* main.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -102,6 +92,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = E7C9B7B72201EE27001F5774 /* Build configuration list for PBXNativeTarget "ios-app" */;
 			buildPhases = (
+				4C53B02D230D6C4E000CC7D3 /* ShellScript */,
 				E7C9B7A12201EE24001F5774 /* Sources */,
 				E7C9B7A22201EE24001F5774 /* Frameworks */,
 				E7C9B7A32201EE24001F5774 /* Resources */,
@@ -162,6 +153,26 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		4C53B02D230D6C4E000CC7D3 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"$SRCROOT/../gradlew\" -p \"$SRCROOT/../common\" copyFramework \\\n-Pconfiguration.build.dir=\"$CONFIGURATION_BUILD_DIR\"          \\\n-Pkotlin.build.type=\"$KOTLIN_BUILD_TYPE\"                      \\\n-Pkotlin.target=\"$KOTLIN_TARGET\"\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		E7C9B7A12201EE24001F5774 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;

ios-app/ios-app/ViewController.swift

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import main
+import common
 
 class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSource {
 

js-app/build.gradle

@@ -1,15 +1,17 @@
 plugins {
-    id("org.jetbrains.kotlin.frontend")
-    id("kotlin-dce-js")
     id("kotlin2js")
 }
+apply {
+    plugin("org.jetbrains.kotlin.frontend")
+    plugin("kotlin-dce-js")
+}
 
 dependencies {
     compile("org.jetbrains.kotlin:kotlin-stdlib-js:$Versions.kotlin")
-    compile("org.jetbrains.kotlinx:kotlinx-html-js:0.6.11")
+    compile("org.jetbrains.kotlinx:kotlinx-html:$Versions.kotlinxHtml")
 
-    compile("org.jetbrains:kotlin-react:16.6.0-pre.62-kotlin-1.3.0")
-    compile("org.jetbrains:kotlin-react-dom:16.6.0-pre.62-kotlin-1.3.0")
+    compile("org.jetbrains:kotlin-react:$Versions.kotlinReact")
+    compile("org.jetbrains:kotlin-react-dom:$Versions.kotlinReact")
     compile(project(":common"))
 }
 
@@ -20,10 +22,9 @@ compileKotlin2Js {
 }
 
 kotlinFrontend {
-    downloadNodeJsVersion = "latest"
+    downloadNodeJsVersion = Versions.nodeJs
 
     npm {
-        dependency("kotlinx-html-js")
         dependency("react")
         dependency("react-dom")
         dependency("material-components-web")