fix iOS build

Author: patjackson52

common/build.gradle

@@ -7,39 +7,17 @@ apply plugin: 'kotlin-multiplatform'
 apply plugin: 'kotlinx-serialization'
 
 kotlin {
-
-//    iosArm64("ios")
-//    iosX64("iosSim")
-//
-//    targets.all { target ->
-//        if (target.name == 'android') return // Android handles this differently
-//        compilations.all { compilation ->
-//            tasks[compileKotlinTaskName].kotlinOptions {
-//                freeCompilerArgs = ['-Xuse-experimental=kotlin.Experimental']
-//            }
-//        }
-//    }
-//
     targets {
 //        fromPreset(presets.jvm, 'jvm')
-
-//        fromPreset(presets.android, 'androidMain')
         fromPreset(presets.android, 'android')
         final def iOSTarget = System.getenv('SDK_NAME')?.startsWith("iphoneos") \
                               ? presets.iosArm64 : presets.iosX64
 
         fromPreset(iOSTarget, 'ios') {
             binaries {
-                framework('shared')
+                framework('common')
             }
         }
-
-//         Change to `presets.iosArm64` to deploy the app to iPhone
-//         Change to `presets.iosX64` to deploy the app to iPhone
-//            fromPreset(presets.iosX64, 'ios') {
-//            fromPreset(presets.iosArm64, 'ios') {
-//            compilations.main.outputKinds('FRAMEWORK')
-//        }
     }
     sourceSets {
         commonMain {
@@ -104,9 +82,6 @@ kotlin {
                 implementation "io.ktor:ktor-client-json-native:$ktorVersion"
             }
         }
-
-//        iosSimMain.dependsOn iosMain
-//        iosSimTest.dependsOn iosTest
     }
 }
 
@@ -132,15 +107,16 @@ android {
 // Don't run this task directly,
 // Xcode runs this task itself during its build process when we configure it.
 // make sure all Gradle infrastructure exists (gradle.wrapper, gradlew)
-//and gradlw is in executable mode (chmod +x gradlew)
+//and gradlew is in executable mode (chmod +x gradlew)
 task packForXCode(type: Sync) {
     final File frameworkDir = new File(buildDir, "xcode-frameworks")
     final String mode = project.findProperty("XCODE_CONFIGURATION")?.toUpperCase() ?: 'DEBUG'
+    final def framework = kotlin.targets.ios.binaries.getFramework("common", mode)
 
     inputs.property "mode", mode
-    dependsOn kotlin.targets.ios.compilations.main.linkTaskName("FRAMEWORK", mode)
+    dependsOn framework.linkTask
 
-    from { kotlin.targets.ios.compilations.main.getBinary("FRAMEWORK", mode).parentFile }
+    from { framework.outputFile.parentFile }
     into frameworkDir
 
     doLast {

common/src/commonMain/kotlin/com/willowtreeapps/common/ui/PresenterFactory.kt

@@ -3,6 +3,7 @@ package com.willowtreeapps.common
 import com.beyondeye.reduks.*
 import com.willowtreeapps.common.ui.*
 import kotlin.coroutines.CoroutineContext
+import kotlin.reflect.KClass
 
 /**
  * PresenterFactory that creates presenters for all views in the application.
@@ -22,9 +23,9 @@ internal class PresenterFactory(private val gameEngine: GameEngine, networkConte
     private val gameResultsPresenter by lazy { GameResultsPresenter(gameEngine.appStore) }
     private val settingsPresenter by lazy { SettingsPresenter(gameEngine.appStore) }
 
-
     fun <T : View> attachView(view: T): Presenter<out View?> {
         Logger.d("AttachView: $view")
+
         if (subscription == null) {
             subscription = gameEngine.appStore.subscribe(this)
         }
@@ -59,6 +60,8 @@ internal class PresenterFactory(private val gameEngine: GameEngine, networkConte
             questPresenter.detachView(view)
         if (view is GameResultsView)
             gameResultsPresenter.detachView(view)
+        if (view is SettingsView)
+            settingsPresenter.detachView(view)
 
         if (hasAttachedViews()) {
             subscription?.unsubscribe()
@@ -78,6 +81,9 @@ internal class PresenterFactory(private val gameEngine: GameEngine, networkConte
         if (gameResultsPresenter.isAttached()) {
             gameResultsPresenter.onStateChange(gameEngine.appStore.state)
         }
+        if (settingsPresenter.isAttached()) {
+            gameResultsPresenter.onStateChange(gameEngine.appStore.state)
+        }
 //        presenters.forEach { it.onStateChange(gameEngine.appStore.state) }
     }
 }

iOS/NameGame/NameGame.xcodeproj/project.pbxproj

@@ -8,6 +8,8 @@
 
 /* Begin PBXBuildFile section */
 		1E19EEA6224019610094EA01 /* StartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E19EEA5224019610094EA01 /* StartViewController.swift */; };
+		1E37F67F225C064E00CC126B /* common.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E37F67E225C064E00CC126B /* common.framework */; };
+		1E37F682225C078400CC126B /* common.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1E37F680225C078400CC126B /* common.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		1E43892D224013860034263E /* IosNavigator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E43892C224013860034263E /* IosNavigator.swift */; };
 		1E43892F224015A80034263E /* QuestionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E43892E224015A80034263E /* QuestionViewController.swift */; };
 		1E9D6D35224EA56200F5C0B8 /* SAConfettiView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E9D6D34224EA55800F5C0B8 /* SAConfettiView.swift */; };
@@ -24,8 +26,6 @@
 		1EB9EA892238071B008AF004 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1EB9EA872238071B008AF004 /* LaunchScreen.storyboard */; };
 		1EB9EA942238071B008AF004 /* NameGameTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EB9EA932238071B008AF004 /* NameGameTests.swift */; };
 		1EB9EA9F2238071C008AF004 /* NameGameUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EB9EA9E2238071C008AF004 /* NameGameUITests.swift */; };
-		1EB9EAB022382532008AF004 /* main.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EB9EAAF22382532008AF004 /* main.framework */; };
-		1EB9EAB422382BBC008AF004 /* main.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1EB9EAB222382BBC008AF004 /* main.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D794BC0580F8ABAD74AEC0E7 /* Pods_NameGameTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53A3C83D4D3C38CDD08E0A5E /* Pods_NameGameTests.framework */; };
 		EB73C32D7A5026680B6E058F /* Pods_NameGameUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ACB48F17499F8632BF88AB6B /* Pods_NameGameUITests.framework */; };
 /* End PBXBuildFile section */
@@ -54,7 +54,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				1EB9EAB422382BBC008AF004 /* main.framework in Embed Frameworks */,
+				1E37F682225C078400CC126B /* common.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -63,6 +63,9 @@
 
 /* Begin PBXFileReference section */
 		1E19EEA5224019610094EA01 /* StartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartViewController.swift; sourceTree = "<group>"; };
+		1E37F67C225C063C00CC126B /* common.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = common.framework.dSYM; path = "../../common/build/xcode-frameworks/common.framework.dSYM"; sourceTree = "<group>"; };
+		1E37F67E225C064E00CC126B /* common.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = common.framework; sourceTree = "<group>"; };
+		1E37F680225C078400CC126B /* common.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = common.framework; sourceTree = "<group>"; };
 		1E43892C224013860034263E /* IosNavigator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosNavigator.swift; sourceTree = "<group>"; };
 		1E43892E224015A80034263E /* QuestionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuestionViewController.swift; sourceTree = "<group>"; };
 		1E9D6D34224EA55800F5C0B8 /* SAConfettiView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SAConfettiView.swift; sourceTree = "<group>"; };
@@ -86,8 +89,6 @@
 		1EB9EA9E2238071C008AF004 /* NameGameUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NameGameUITests.swift; sourceTree = "<group>"; };
 		1EB9EAA02238071C008AF004 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		1EB9EAAD22382510008AF004 /* NameGame */ = {isa = PBXFileReference; lastKnownFileType = folder; name = NameGame; path = ../..; sourceTree = "<group>"; };
-		1EB9EAAF22382532008AF004 /* main.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = main.framework; path = ../../common/build/bin/ios/mainDebugFramework/main.framework; sourceTree = "<group>"; };
-		1EB9EAB222382BBC008AF004 /* main.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = main.framework; path = ../../common/build/bin/ios/mainDebugFramework/main.framework; sourceTree = "<group>"; };
 		53A3C83D4D3C38CDD08E0A5E /* Pods_NameGameTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NameGameTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		ACB48F17499F8632BF88AB6B /* Pods_NameGameUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NameGameUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		CEC3584174F51CF5ECAE2ED7 /* Pods_NameGame.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NameGame.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -98,7 +99,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1EB9EAB022382532008AF004 /* main.framework in Frameworks */,
+				1E37F67F225C064E00CC126B /* common.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -124,7 +125,8 @@
 		1EB9EA722238071A008AF004 = {
 			isa = PBXGroup;
 			children = (
-				1EB9EAB222382BBC008AF004 /* main.framework */,
+				1E37F67E225C064E00CC126B /* common.framework */,
+				1E37F680225C078400CC126B /* common.framework */,
 				1EB9EA7D2238071A008AF004 /* NameGame */,
 				1EB9EA922238071B008AF004 /* NameGameTests */,
 				1EB9EA9D2238071C008AF004 /* NameGameUITests */,
@@ -187,7 +189,7 @@
 		1EB9EAAC2238250F008AF004 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				1EB9EAAF22382532008AF004 /* main.framework */,
+				1E37F67C225C063C00CC126B /* common.framework.dSYM */,
 				1EB9EAAD22382510008AF004 /* NameGame */,
 				CEC3584174F51CF5ECAE2ED7 /* Pods_NameGame.framework */,
 				53A3C83D4D3C38CDD08E0A5E /* Pods_NameGameTests.framework */,
@@ -347,7 +349,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#move to the xcode-frameworks folder\ncd \"$SRCROOT/../../common/build/xcode-frameworks\"\n#run the gradle task\n./gradlew :common:packForXCode -PXCODE_CONFIGURATION=${CONFIGURATION}\n";
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#move to the xcode-frameworks folder\n#cd \"$SRCROOT/../../common/build/xcode-frameworks\"\ncd \"$SRCROOT/../../\"\n\n#run the gradle task\n./gradlew :common:build -PXCODE_CONFIGURATION=${CONFIGURATION}\n";
 		};
 		5103126C9BF956C7ADB08E88 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -584,7 +586,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 9W3M6638YZ;
 				ENABLE_BITCODE = NO;
-				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../common/build/bin/ios/mainDebugFramework";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SRCROOT)/../../common/build/bin/ios/mainDebugFramework",
+					"$(PROJECT_DIR)",
+				);
 				INFOPLIST_FILE = NameGame/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -604,7 +609,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 9W3M6638YZ;
 				ENABLE_BITCODE = NO;
-				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../common/build/bin/ios/mainDebugFramework";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SRCROOT)/../../common/build/bin/ios/mainDebugFramework",
+					"$(PROJECT_DIR)",
+				);
 				INFOPLIST_FILE = NameGame/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

iOS/NameGame/NameGame/AppDelegate.swift

@@ -1,5 +1,5 @@
 import UIKit
-import main
+import common
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {

iOS/NameGame/NameGame/GameResultsViewController.swift

@@ -1,5 +1,5 @@
 import Foundation
-import main
+import common
 import UIKit
 
 class GameResultsViewController: UIViewController, GameResultsView {

iOS/NameGame/NameGame/ImageUtils.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 import UIKit
-import main
+import common
 
 public extension UIImageView {
     func downloaded(from url: URL, contentMode mode: UIView.ContentMode = .scaleAspectFit, onComplete: @escaping () -> ()) {  // for swift 4.2 syntax just use ===> mode: UIView.ContentMode

iOS/NameGame/NameGame/IosNavigator.swift

@@ -1,5 +1,5 @@
 import Foundation
-import main
+import common
 import UIKit
 
 

iOS/NameGame/NameGame/QuestionViewController.swift

@@ -1,6 +1,6 @@
 import Foundation
 import UIKit
-import main
+import common
 
 
 class QuestionViewController: UIViewController, QuestionView {

iOS/NameGame/NameGame/StartViewController.swift

@@ -1,6 +1,6 @@
 import Foundation
 import UIKit
-import main
+import common
 
 class StartViewController: UIViewController, StartView {