Issue #7 - Move http and serialization to common

Create a fake `app-ios-lib` module as a workaround for JetBrains/kotlin-native#2423. Update `app-ios` project due to changed framework name. Still not using Kotlin classes for REST + JSON though (for now).
4ntoine · Dec 29, 2019 · cebb22a · cebb22a
1 parent d544180
commit cebb22a
Show file tree

Hide file tree

Showing 12 changed files with 89 additions and 41 deletions.
diff --git a/app-infra-rest-ktor/build.gradle b/app-infra-rest-ktor/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id 'idea'
     id 'kotlin-multiplatform'
     id 'kotlinx-serialization'
-    id 'org.jetbrains.kotlin.native.cocoapods'
 }
 
 kotlin {
@@ -65,18 +64,4 @@ kotlin {
     }
 }
 
-version = "$rootProject.module_version"
-
-kotlin {
-    cocoapods {
-        summary = "Infra REST (HTTP + JSON) of NotesClientApp"
-        homepage = "https://github.com/4ntoine/NotesClientApp"
-    }
-
-    targets.iosX64.binaries
-        .findAll { it instanceof org.jetbrains.kotlin.gradle.plugin.mpp.Framework }
-        .every {
-            it.export "name.antonsmirnov.notes:app-api-iosx64:$rootProject.server_module_version"
-            it.transitiveExport = true
-        }
-}
+version = "$rootProject.module_version"
diff --git a/app-ios-lib/build.gradle b/app-ios-lib/build.gradle
@@ -0,0 +1,76 @@
+plugins {
+    id 'kotlin-multiplatform'
+    id('org.jetbrains.kotlin.native.cocoapods')
+}
+
+kotlin {
+    targets {
+        jvm()
+        iosX64() // iOS simulator
+    }
+
+    sourceSets {
+        commonMain {
+            kotlin.srcDirs = [
+                "${project.rootDir}/app-mvp/src/commonMain/kotlin",
+                "${project.rootDir}/app-infra-rest-ktor/src/commonMain/kotlin"
+            ]
+            dependencies {
+//                # using of `implementation project(':...)` does not work and leads to compilation error:
+//                java.lang.IllegalStateException: IrClassSymbolImpl for deserialized class AddResponseJson is already bound
+//                (I believe it's because of `app-api` imported twice (1 for both project))
+//                implementation project(':app-infra-rest-ktor')
+//                implementation project(':app-mvp')
+
+//                # -ktor deps
+                api "io.ktor:ktor-client-core:$rootProject.ktor_version"
+                api "io.ktor:ktor-client-serialization:$rootProject.ktor_version"
+                api "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:$rootProject.coroutines_version"
+//                # both -ktor and -mvp deps
+                implementation 'org.jetbrains.kotlin:kotlin-stdlib'
+                api "name.antonsmirnov.notes:app-api-metadata:$rootProject.server_module_version"
+            }
+        }
+        iosX64Main {
+            kotlin.srcDirs = [
+                "${project.rootDir}/app-infra-rest-ktor/src/iosX64Main"
+            ]
+            dependencies {
+//                # -ktor deps
+                implementation "io.ktor:ktor-client-ios:$rootProject.ktor_version"
+                implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:$rootProject.serialization_version"
+                implementation "io.ktor:ktor-client-serialization-native:$rootProject.ktor_version"
+//                # both -ktor and -mvp deps
+                api "name.antonsmirnov.notes:app-api-iosx64:$rootProject.server_module_version"
+            }
+        }
+    }
+
+    // All exceptions in Kotlin are not checked, but in Swift they are checked.
+    // So we need @Throws annotation for iOS compatibility to generate swift signatures with `.. throws -> ..`
+    // This requires @ExperimentalMultiplatform annotation in all methods with @Throws.
+    // In order to prevent adding @ExperimentalMultiplatform every here and there we can use compiler option:
+    targets.all {
+        compilations.all {
+            kotlinOptions {
+                freeCompilerArgs += '-Xuse-experimental=kotlin.ExperimentalMultiplatform'
+            }
+        }
+    }
+}
+
+version = "$rootProject.module_version"
+
+kotlin {
+    cocoapods {
+        summary = "iOS Kotlin library of NotesClientApp"
+        homepage = "https://github.com/4ntoine/NotesClientApp"
+    }
+
+    targets.iosX64.binaries
+        .findAll { it instanceof org.jetbrains.kotlin.gradle.plugin.mpp.Framework }
+        .every {
+            it.export "name.antonsmirnov.notes:app-api-iosx64:$rootProject.server_module_version"
+            it.transitiveExport = true
+        }
+}
diff --git a/app-ios/Podfile b/app-ios/Podfile
@@ -4,6 +4,7 @@ use_frameworks!
 platform :ios, '9.0'
 
 target 'app-ios' do
-    pod 'app_mvp', :path => '../app-mvp'
-    pod 'app_infra_rest_ktor', :path => '../app-infra-rest-ktor'
+	pod 'app_ios_lib', :path => '../app-ios-lib'
+    # pod 'app_mvp', :path => '../app-mvp'
+    # pod 'app_infra_rest_ktor', :path => '../app-infra-rest-ktor'
 end
diff --git a/app-ios/app-ios/Rest/Deserializer.swift b/app-ios/app-ios/Rest/Deserializer.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import app_mvp
+import app_ios_lib
 
 protocol Deserializer {
     func deserializeListNotes(data: Data) throws -> ListNotesResponse

diff --git a/app-ios/app-ios/Rest/RestApi.swift b/app-ios/app-ios/Rest/RestApi.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import app_mvp
+import app_ios_lib
 
 protocol RestApi : ListNotes, AddNote {
 

diff --git a/app-ios/app-ios/ThreadManager.swift b/app-ios/app-ios/ThreadManager.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import app_mvp
+import app_ios_lib
 
 // Executes in current thread
 class BlockingThreadManager : ThreadManager {

diff --git a/app-ios/app-ios/UI/AddNoteViewController.swift b/app-ios/app-ios/UI/AddNoteViewController.swift
@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import app_mvp
+import app_ios_lib
 
 class AddNoteViewController: UIViewController, AddNoteView {
 

diff --git a/app-ios/app-ios/UI/ListNotesViewController.swift b/app-ios/app-ios/UI/ListNotesViewController.swift
@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import app_mvp
+import app_ios_lib
 
 // TODO: add loading indicator
 class ListNotesViewController: UITableViewController, ListNotesView {

diff --git a/app-ios/app-ios/UI/ServerUrlViewController.swift b/app-ios/app-ios/UI/ServerUrlViewController.swift
@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import app_mvp
+import app_ios_lib
 
 class RestServerUrlModel : ServerUrlModel {
     override func update(host: String, port: UInt32) {

diff --git a/app-mvp/build.gradle b/app-mvp/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'idea'
     id 'kotlin-multiplatform'
-    id('org.jetbrains.kotlin.native.cocoapods')
 }
 
 kotlin {
@@ -51,18 +50,4 @@ kotlin {
     }
 }
 
-version = "$rootProject.module_version"
-
-kotlin {
-    cocoapods {
-        summary = "App MVP of NotesClientApp"
-        homepage = "https://github.com/4ntoine/NotesClientApp"
-    }
-
-    targets.iosX64.binaries
-        .findAll { it instanceof org.jetbrains.kotlin.gradle.plugin.mpp.Framework }
-        .every {
-            it.export "name.antonsmirnov.notes:app-api-iosx64:$rootProject.server_module_version"
-            it.transitiveExport = true
-        }
-}
+version = "$rootProject.module_version"
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 ext {
-    module_version = '0.8.1'
+    module_version = '0.9.0'
     server_module_version = '1.3'
     mockito_kotlin_version = '2.1.0'
     androidx_version = '1.0.2'

diff --git a/settings.gradle b/settings.gradle
@@ -3,6 +3,7 @@ rootProject.name = 'NotesClientApp'
 include 'app-mvp'
 include 'app-infra-rest-retrofit'
 include 'app-infra-rest-ktor'
+include 'app-ios-lib'
 include 'app-android'
 include 'app-javafx'