Skip to content

Commit

Permalink
fix(ios): Fix Unsupported swift architecture (#393)
Browse files Browse the repository at this point in the history
* fix(ios): fix unsupported Swift architecture

* fix(ios): fix unsupported Swift architecture

* fix(ios): update version name

* Update ios.yml

* fix(ios): fix android actions
fix(android): fix android actions

* fix(ios): fix android actions
fix(android): fix android actions

* fix(android): fix android actions order

* fix(ios): fix android actions order

* fix(ios): fix android actions order
fix(android): fix android actions order

* update android workflow

* update ios workflow

* keep original package json files

---------

Co-authored-by: Abdullah Al Faqeir <[email protected]>
Co-authored-by: m1ga <[email protected]>
Co-authored-by: Hans Knöchel <[email protected]>
  • Loading branch information
4 people authored Sep 15, 2024
1 parent cf39ce3 commit d727b18
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
SDK_VERSION: 12.4.0.GA
# This one uses Swift 3.8.1. If you're running into the "Unsupported Swift architecture", verify which
# Swift version is used for the specified Ti SDK version, e.g. by looking into:
# ~/Library/Application Support/Titanium/mobilesdk/osx/<version>/iphone/Frameworks/TitaniumKit.xcframework/ios-arm64/TitaniumKit.framework/Headers/TitaniumKit-Swift.h
# ~/Library/Application Support/Titanium/mobilesdk/osx/<version>/iphone/Frameworks/TitaniumKit.xcframework/ios-arm64/TitaniumKit.framework/Headers/TitaniumKit-Swift.h
#
# An overview of macOS <> Xcode <> Swift versions can be found here: https://developer.apple.com/support/xcode/
DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
Expand Down
Empty file.
42 changes: 34 additions & 8 deletions iphone/hyperloop.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
24B0352E1BC4858500F3D9E5 /* HyperloopViewProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HyperloopViewProxy.h; path = titanium/HyperloopViewProxy.h; sourceTree = "<group>"; };
24B0355C1BC7233000F3D9E5 /* TestJS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestJS.m; sourceTree = "<group>"; };
24B0355F1BC726E000F3D9E5 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
5DE940252C962758002AFC1D /* TiHyperloopModule_Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TiHyperloopModule_Prefix.pch; sourceTree = "<group>"; };
B68D53D31CAEED6600EBFE65 /* define.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = define.m; path = src/define.m; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand All @@ -106,6 +107,7 @@
2461FD7E1BB08963006D4D9E = {
isa = PBXGroup;
children = (
5DE940252C962758002AFC1D /* TiHyperloopModule_Prefix.pch */,
247077771BB3057C00150B9F /* titanium.xcconfig */,
247077701BB304CF00150B9F /* Titanium */,
2461FDA61BB0C3D9006D4D9E /* Source */,
Expand Down Expand Up @@ -395,28 +397,52 @@
2461FD911BB08963006D4D9E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
"TIMODULE=1",
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = NO;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_MODEL_TUNING = G5;
GCC_PREFIX_HEADER = TiHyperloopModule_Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)";
MTL_ENABLE_DEBUG_INFO = "";
OTHER_CFLAGS = (
"-DDEBUG",
"-DTI_POST_1_2",
);
IPHONEOS_DEPLOYMENT_TARGET= 12.0;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
WARNING_CFLAGS = "-Wno-arc-performSelector-leaks";
};
name = Debug;
};
2461FD921BB08963006D4D9E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
"TIMODULE=1",
);
IPHONEOS_DEPLOYMENT_TARGET= 12.0;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = NO;
GCC_MODEL_TUNING = "";
GCC_PREFIX_HEADER = TiHyperloopModule_Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)";
MTL_ENABLE_DEBUG_INFO = "";
OTHER_CFLAGS = "-DTI_POST_1_2";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
WARNING_CFLAGS = "-Wno-arc-performSelector-leaks";
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion iphone/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ name: hyperloop
moduleid: hyperloop
guid: bdaca69f-b316-4ce6-9065-7a61e1dafa39
platform: iphone
minsdk: 9.2.0
minsdk: 12.4.0.GA

0 comments on commit d727b18

Please sign in to comment.