Skip to content

ios fixes #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martinbonnin merged 2 commits into from
Apr 2, 2025
Merged

ios fixes #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a382d4
Misc iOS fixes
martinbonnin Mar 20, 2025
33e5ccc
hopefully fix build
martinbonnin Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 35 additions & 64 deletions iosApp/Android Makers.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
objects = {

/* Begin PBXBuildFile section */
616F42D32D7F43B600540EC0 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 616F42D22D7F43B600540EC0 /* FirebaseAuth */; };
616F42D52D7F43B600540EC0 /* FirebaseCore in Frameworks */ = {isa = PBXBuildFile; productRef = 616F42D42D7F43B600540EC0 /* FirebaseCore */; };
616F42D72D7F43B600540EC0 /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = 616F42D62D7F43B600540EC0 /* FirebaseCrashlytics */; };
616F42D92D7F43B600540EC0 /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 616F42D82D7F43B600540EC0 /* FirebaseFirestore */; };
616F42DB2D7F8E8300540EC0 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 616F42DA2D7F8E8300540EC0 /* GoogleService-Info.plist */; };
61C8A7672D8B199B0046C2CC /* FirebaseCore in Frameworks */ = {isa = PBXBuildFile; productRef = 61C8A7662D8B199B0046C2CC /* FirebaseCore */; };
61C8A7692D8B199B0046C2CC /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 61C8A7682D8B199B0046C2CC /* FirebaseFirestore */; };
61C8A76B2D8B1C490046C2CC /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 61C8A76A2D8B1C490046C2CC /* FirebaseAuth */; };
B2CD272F234D06530016AA02 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2CD272E234D06530016AA02 /* AppDelegate.swift */; };
B2CD2731234D06530016AA02 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2CD2730234D06530016AA02 /* SceneDelegate.swift */; };
B2CD2733234D06530016AA02 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2CD2732234D06530016AA02 /* ContentView.swift */; };
Expand All @@ -22,7 +21,6 @@

/* Begin PBXFileReference section */
33CD20B328087FE7005084EF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
6129B5822D7F3FA5005122B6 /* firebase-ios-sdk */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "firebase-ios-sdk"; path = "/Users/martinbonnin/Library/Developer/Xcode/DerivedData/Android_Makers-apusnlhmclyhkxgkhncfixjudntz/SourcePackages/checkouts/firebase-ios-sdk"; sourceTree = "<absolute>"; };
616F42DA2D7F8E8300540EC0 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = SOURCE_ROOT; };
B29CC7032427A01200FB7EF3 /* AndroidMakers.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = AndroidMakers.entitlements; sourceTree = "<group>"; };
B2CD272B234D06530016AA02 /* Android Makers.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Android Makers.app"; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -39,10 +37,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
616F42D72D7F43B600540EC0 /* FirebaseCrashlytics in Frameworks */,
616F42D92D7F43B600540EC0 /* FirebaseFirestore in Frameworks */,
616F42D52D7F43B600540EC0 /* FirebaseCore in Frameworks */,
616F42D32D7F43B600540EC0 /* FirebaseAuth in Frameworks */,
61C8A7672D8B199B0046C2CC /* FirebaseCore in Frameworks */,
61C8A76B2D8B1C490046C2CC /* FirebaseAuth in Frameworks */,
61C8A7692D8B199B0046C2CC /* FirebaseFirestore in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -52,7 +49,6 @@
6129B5812D7F3F56005122B6 /* Frameworks */ = {
isa = PBXGroup;
children = (
6129B5822D7F3FA5005122B6 /* firebase-ios-sdk */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -125,18 +121,16 @@
B2CD2727234D06530016AA02 /* Sources */,
B2CD2728234D06530016AA02 /* Frameworks */,
B2CD2729234D06530016AA02 /* Resources */,
B27CC3E82455ADD40055D36B /* Copy Firebase plist files */,
);
buildRules = (
);
dependencies = (
);
name = "Android Makers";
packageProductDependencies = (
616F42D22D7F43B600540EC0 /* FirebaseAuth */,
616F42D42D7F43B600540EC0 /* FirebaseCore */,
616F42D62D7F43B600540EC0 /* FirebaseCrashlytics */,
616F42D82D7F43B600540EC0 /* FirebaseFirestore */,
61C8A7662D8B199B0046C2CC /* FirebaseCore */,
61C8A7682D8B199B0046C2CC /* FirebaseFirestore */,
61C8A76A2D8B1C490046C2CC /* FirebaseAuth */,
);
productName = RobotConf;
productReference = B2CD272B234D06530016AA02 /* Android Makers.app */;
Expand Down Expand Up @@ -168,7 +162,7 @@
);
mainGroup = B2CD2722234D06530016AA02;
packageReferences = (
616F42D12D7F43B600540EC0 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
61C8A7632D8B199B0046C2CC /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
);
productRefGroup = B2CD272C234D06530016AA02 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -211,25 +205,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode \n";
};
B27CC3E82455ADD40055D36B /* Copy Firebase plist files */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Copy Firebase plist files";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "MAIN_FIREBASE_FILE=\"${SRCROOT}/AndroidMakers/GoogleService-Info.plist\"\nOPENFEEDBACK_FIREBASE_FILE=\"${SRCROOT}/AndroidMakers/OpenFeedback-Info.plist\"\nif [ -f \"${MAIN_FIREBASE_FILE}\" ]; then\n cp -r \"${MAIN_FIREBASE_FILE}\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app\"\nfi\n\nif [ -f \"${OPENFEEDBACK_FIREBASE_FILE}\" ]; then\n cp -r \"${OPENFEEDBACK_FIREBASE_FILE}\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app\"\nfi\n";
shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -381,12 +357,11 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = AndroidMakers/AndroidMakers.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1465;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1470;
DEVELOPMENT_ASSET_PATHS = "\"AndroidMakers/Preview Content\"";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 57MV6634WZ;
DEVELOPMENT_TEAM = 57MV6634WZ;
ENABLE_PREVIEWS = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
Expand All @@ -396,16 +371,17 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 4.1;
MARKETING_VERSION = 1470;
OTHER_LDFLAGS = (
"-framework",
shared,
"-lsqlite3",
"-ObjC",
"-ld_classic",
);
PRODUCT_BUNDLE_IDENTIFIER = com.paug.RobotConf;
PRODUCT_NAME = "Android Makers";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Robot 2024";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand All @@ -416,12 +392,11 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = AndroidMakers/AndroidMakers.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1465;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1470;
DEVELOPMENT_ASSET_PATHS = "\"AndroidMakers/Preview Content\"";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 57MV6634WZ;
DEVELOPMENT_TEAM = 57MV6634WZ;
ENABLE_PREVIEWS = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
Expand All @@ -431,16 +406,17 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 4.1;
MARKETING_VERSION = 1470;
OTHER_LDFLAGS = (
"-framework",
shared,
"-lsqlite3",
"-ObjC",
"-ld_classic",
);
PRODUCT_BUNDLE_IDENTIFIER = com.paug.RobotConf;
PRODUCT_NAME = "Android Makers";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Robot 2024";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand Down Expand Up @@ -470,36 +446,31 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
616F42D12D7F43B600540EC0 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
61C8A7632D8B199B0046C2CC /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 11.9.0;
minimumVersion = 11.10.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
616F42D22D7F43B600540EC0 /* FirebaseAuth */ = {
isa = XCSwiftPackageProductDependency;
package = 616F42D12D7F43B600540EC0 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseAuth;
};
616F42D42D7F43B600540EC0 /* FirebaseCore */ = {
61C8A7662D8B199B0046C2CC /* FirebaseCore */ = {
isa = XCSwiftPackageProductDependency;
package = 616F42D12D7F43B600540EC0 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
package = 61C8A7632D8B199B0046C2CC /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseCore;
};
616F42D62D7F43B600540EC0 /* FirebaseCrashlytics */ = {
61C8A7682D8B199B0046C2CC /* FirebaseFirestore */ = {
isa = XCSwiftPackageProductDependency;
package = 616F42D12D7F43B600540EC0 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseCrashlytics;
package = 61C8A7632D8B199B0046C2CC /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseFirestore;
};
616F42D82D7F43B600540EC0 /* FirebaseFirestore */ = {
61C8A76A2D8B1C490046C2CC /* FirebaseAuth */ = {
isa = XCSwiftPackageProductDependency;
package = 616F42D12D7F43B600540EC0 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseFirestore;
package = 61C8A7632D8B199B0046C2CC /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseAuth;
};
/* End XCSwiftPackageProductDependency section */
};
Expand Down
8 changes: 4 additions & 4 deletions iosApp/Android Makers.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import org.jetbrains.kotlin.gradle.plugin.mpp.Framework
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget

plugins {
alias(libs.plugins.androidmakers.kmp.library)
alias(libs.plugins.jetbrainsCompose)
alias(libs.plugins.compose.compiler)
}

kotlin {
Expand All @@ -12,6 +17,11 @@ kotlin {
it.binaries.framework {
baseName = "shared"
isStatic = true

// https://youtrack.jetbrains.com/issue/KT-70202/Xcode-16-Linker-fails-with-SIGBUS
linkerOpts("-ld_classic")
linkerOpts("-ObjC")

export(project(":shared:ui"))
export(project(":shared:domain"))
export(project(":shared:di"))
Expand Down
1 change: 0 additions & 1 deletion shared/ui/src/commonMain/kotlin/com/androidmakers/ui/agenda/SessionDetailLayout.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ import org.jetbrains.compose.resources.painterResource
import org.jetbrains.compose.resources.stringResource
import org.jetbrains.compose.ui.tooling.preview.Preview


@Composable
fun SessionDetailScreen(
viewModel: SessionDetailViewModel,
Expand Down