diff --git a/.gitignore b/.gitignore index c090834..47c6702 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ build/ .idea/ .DS_STORE local.properties +xcuserdata \ No newline at end of file diff --git a/.run/iosApp.run.xml b/.run/iosApp.run.xml new file mode 100644 index 0000000..f43c680 --- /dev/null +++ b/.run/iosApp.run.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/iosApp/Modules/Artifacts/shared.xcframework/Info.plist b/iosApp/Modules/Artifacts/shared.xcframework/Info.plist new file mode 100644 index 0000000..de6008d --- /dev/null +++ b/iosApp/Modules/Artifacts/shared.xcframework/Info.plist @@ -0,0 +1,41 @@ + + + + + AvailableLibraries + + + LibraryIdentifier + ios-arm64 + LibraryPath + shared.framework + SupportedArchitectures + + arm64 + + SupportedPlatform + ios + + + + LibraryIdentifier + ios-x86_64_arm64-simulator + LibraryPath + shared.framework + SupportedArchitectures + + x86_64 + arm64 + + SupportedPlatform + ios + SupportedPlatformVariant + simulator + + + CFBundlePackageType + XFWK + XCFrameworkFormatVersion + 1.0 + + diff --git a/iosApp/Modules/Artifacts/shared.xcframework/ios-arm64/shared.framework.dSYM/Contents/Info.plist b/iosApp/Modules/Artifacts/shared.xcframework/ios-arm64/shared.framework.dSYM/Contents/Info.plist new file mode 100644 index 0000000..19e854c --- /dev/null +++ b/iosApp/Modules/Artifacts/shared.xcframework/ios-arm64/shared.framework.dSYM/Contents/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleIdentifier + com.apple.xcode.dsym.com.jetbrains.kmm.shared.shared + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + dSYM + CFBundleSignature + ???? + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/iosApp/Modules/Artifacts/shared.xcframework/ios-arm64/shared.framework.dSYM/Contents/Resources/DWARF/shared b/iosApp/Modules/Artifacts/shared.xcframework/ios-arm64/shared.framework.dSYM/Contents/Resources/DWARF/shared new file mode 100644 index 0000000..39ecfb1 Binary files /dev/null and b/iosApp/Modules/Artifacts/shared.xcframework/ios-arm64/shared.framework.dSYM/Contents/Resources/DWARF/shared differ diff --git a/iosApp/Modules/Artifacts/shared.xcframework/ios-arm64/shared.framework/Headers/shared.h b/iosApp/Modules/Artifacts/shared.xcframework/ios-arm64/shared.framework/Headers/shared.h new file mode 100644 index 0000000..6514103 --- /dev/null +++ b/iosApp/Modules/Artifacts/shared.xcframework/ios-arm64/shared.framework/Headers/shared.h @@ -0,0 +1,181 @@ +#import +#import +#import +#import +#import +#import +#import + +@class SharedCalculatorCompanion; + +NS_ASSUME_NONNULL_BEGIN +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunknown-warning-option" +#pragma clang diagnostic ignored "-Wincompatible-property-type" +#pragma clang diagnostic ignored "-Wnullability" + +#pragma push_macro("_Nullable_result") +#if !__has_feature(nullability_nullable_result) +#undef _Nullable_result +#define _Nullable_result _Nullable +#endif + +__attribute__((swift_name("KotlinBase"))) +@interface SharedBase : NSObject +- (instancetype)init __attribute__((unavailable)); ++ (instancetype)new __attribute__((unavailable)); ++ (void)initialize __attribute__((objc_requires_super)); +@end + +@interface SharedBase (SharedBaseCopying) +@end + +__attribute__((swift_name("KotlinMutableSet"))) +@interface SharedMutableSet : NSMutableSet +@end + +__attribute__((swift_name("KotlinMutableDictionary"))) +@interface SharedMutableDictionary : NSMutableDictionary +@end + +@interface NSError (NSErrorSharedKotlinException) +@property (readonly) id _Nullable kotlinException; +@end + +__attribute__((swift_name("KotlinNumber"))) +@interface SharedNumber : NSNumber +- (instancetype)initWithChar:(char)value __attribute__((unavailable)); +- (instancetype)initWithUnsignedChar:(unsigned char)value __attribute__((unavailable)); +- (instancetype)initWithShort:(short)value __attribute__((unavailable)); +- (instancetype)initWithUnsignedShort:(unsigned short)value __attribute__((unavailable)); +- (instancetype)initWithInt:(int)value __attribute__((unavailable)); +- (instancetype)initWithUnsignedInt:(unsigned int)value __attribute__((unavailable)); +- (instancetype)initWithLong:(long)value __attribute__((unavailable)); +- (instancetype)initWithUnsignedLong:(unsigned long)value __attribute__((unavailable)); +- (instancetype)initWithLongLong:(long long)value __attribute__((unavailable)); +- (instancetype)initWithUnsignedLongLong:(unsigned long long)value __attribute__((unavailable)); +- (instancetype)initWithFloat:(float)value __attribute__((unavailable)); +- (instancetype)initWithDouble:(double)value __attribute__((unavailable)); +- (instancetype)initWithBool:(BOOL)value __attribute__((unavailable)); +- (instancetype)initWithInteger:(NSInteger)value __attribute__((unavailable)); +- (instancetype)initWithUnsignedInteger:(NSUInteger)value __attribute__((unavailable)); ++ (instancetype)numberWithChar:(char)value __attribute__((unavailable)); ++ (instancetype)numberWithUnsignedChar:(unsigned char)value __attribute__((unavailable)); ++ (instancetype)numberWithShort:(short)value __attribute__((unavailable)); ++ (instancetype)numberWithUnsignedShort:(unsigned short)value __attribute__((unavailable)); ++ (instancetype)numberWithInt:(int)value __attribute__((unavailable)); ++ (instancetype)numberWithUnsignedInt:(unsigned int)value __attribute__((unavailable)); ++ (instancetype)numberWithLong:(long)value __attribute__((unavailable)); ++ (instancetype)numberWithUnsignedLong:(unsigned long)value __attribute__((unavailable)); ++ (instancetype)numberWithLongLong:(long long)value __attribute__((unavailable)); ++ (instancetype)numberWithUnsignedLongLong:(unsigned long long)value __attribute__((unavailable)); ++ (instancetype)numberWithFloat:(float)value __attribute__((unavailable)); ++ (instancetype)numberWithDouble:(double)value __attribute__((unavailable)); ++ (instancetype)numberWithBool:(BOOL)value __attribute__((unavailable)); ++ (instancetype)numberWithInteger:(NSInteger)value __attribute__((unavailable)); ++ (instancetype)numberWithUnsignedInteger:(NSUInteger)value __attribute__((unavailable)); +@end + +__attribute__((swift_name("KotlinByte"))) +@interface SharedByte : SharedNumber +- (instancetype)initWithChar:(char)value; ++ (instancetype)numberWithChar:(char)value; +@end + +__attribute__((swift_name("KotlinUByte"))) +@interface SharedUByte : SharedNumber +- (instancetype)initWithUnsignedChar:(unsigned char)value; ++ (instancetype)numberWithUnsignedChar:(unsigned char)value; +@end + +__attribute__((swift_name("KotlinShort"))) +@interface SharedShort : SharedNumber +- (instancetype)initWithShort:(short)value; ++ (instancetype)numberWithShort:(short)value; +@end + +__attribute__((swift_name("KotlinUShort"))) +@interface SharedUShort : SharedNumber +- (instancetype)initWithUnsignedShort:(unsigned short)value; ++ (instancetype)numberWithUnsignedShort:(unsigned short)value; +@end + +__attribute__((swift_name("KotlinInt"))) +@interface SharedInt : SharedNumber +- (instancetype)initWithInt:(int)value; ++ (instancetype)numberWithInt:(int)value; +@end + +__attribute__((swift_name("KotlinUInt"))) +@interface SharedUInt : SharedNumber +- (instancetype)initWithUnsignedInt:(unsigned int)value; ++ (instancetype)numberWithUnsignedInt:(unsigned int)value; +@end + +__attribute__((swift_name("KotlinLong"))) +@interface SharedLong : SharedNumber +- (instancetype)initWithLongLong:(long long)value; ++ (instancetype)numberWithLongLong:(long long)value; +@end + +__attribute__((swift_name("KotlinULong"))) +@interface SharedULong : SharedNumber +- (instancetype)initWithUnsignedLongLong:(unsigned long long)value; ++ (instancetype)numberWithUnsignedLongLong:(unsigned long long)value; +@end + +__attribute__((swift_name("KotlinFloat"))) +@interface SharedFloat : SharedNumber +- (instancetype)initWithFloat:(float)value; ++ (instancetype)numberWithFloat:(float)value; +@end + +__attribute__((swift_name("KotlinDouble"))) +@interface SharedDouble : SharedNumber +- (instancetype)initWithDouble:(double)value; ++ (instancetype)numberWithDouble:(double)value; +@end + +__attribute__((swift_name("KotlinBoolean"))) +@interface SharedBoolean : SharedNumber +- (instancetype)initWithBool:(BOOL)value; ++ (instancetype)numberWithBool:(BOOL)value; +@end + +__attribute__((objc_subclassing_restricted)) +__attribute__((swift_name("Calculator"))) +@interface SharedCalculator : SharedBase +- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer)); ++ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead"))); +@property (class, readonly, getter=companion) SharedCalculatorCompanion *companion __attribute__((swift_name("companion"))); +@end + +__attribute__((objc_subclassing_restricted)) +__attribute__((swift_name("Calculator.Companion"))) +@interface SharedCalculatorCompanion : SharedBase ++ (instancetype)alloc __attribute__((unavailable)); ++ (instancetype)allocWithZone:(struct _NSZone *)zone __attribute__((unavailable)); ++ (instancetype)companion __attribute__((swift_name("init()"))); +@property (class, readonly, getter=shared) SharedCalculatorCompanion *shared __attribute__((swift_name("shared"))); +- (int32_t)sumA:(int32_t)a b:(int32_t)b __attribute__((swift_name("sum(a:b:)"))); +@end + +__attribute__((objc_subclassing_restricted)) +__attribute__((swift_name("Greeting"))) +@interface SharedGreeting : SharedBase +- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer)); ++ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead"))); +- (NSString *)greeting __attribute__((swift_name("greeting()"))); +@end + +__attribute__((objc_subclassing_restricted)) +__attribute__((swift_name("Platform"))) +@interface SharedPlatform : SharedBase +- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer)); ++ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead"))); +@property (readonly) NSString *platform __attribute__((swift_name("platform"))); +@end + +#pragma pop_macro("_Nullable_result") +#pragma clang diagnostic pop +NS_ASSUME_NONNULL_END diff --git a/iosApp/Modules/Artifacts/shared.xcframework/ios-arm64/shared.framework/Info.plist b/iosApp/Modules/Artifacts/shared.xcframework/ios-arm64/shared.framework/Info.plist new file mode 100644 index 0000000..cc6ad67 --- /dev/null +++ b/iosApp/Modules/Artifacts/shared.xcframework/ios-arm64/shared.framework/Info.plist @@ -0,0 +1,35 @@ + + + + + CFBundleExecutable + shared + CFBundleIdentifier + com.jetbrains.kmm.shared.shared + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + shared + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSupportedPlatforms + + iPhoneOS + + CFBundleVersion + 1 + MinimumOSVersion + 9.0 + UIDeviceFamily + + 1 + 2 + + UIRequiredDeviceCapabilities + + arm64 + + + \ No newline at end of file diff --git a/iosApp/Modules/Artifacts/shared.xcframework/ios-arm64/shared.framework/Modules/module.modulemap b/iosApp/Modules/Artifacts/shared.xcframework/ios-arm64/shared.framework/Modules/module.modulemap new file mode 100644 index 0000000..5f942b3 --- /dev/null +++ b/iosApp/Modules/Artifacts/shared.xcframework/ios-arm64/shared.framework/Modules/module.modulemap @@ -0,0 +1,8 @@ +framework module shared { + umbrella header "shared.h" + + export * + module * { export * } + + use Foundation +} diff --git a/iosApp/Modules/Artifacts/shared.xcframework/ios-arm64/shared.framework/shared b/iosApp/Modules/Artifacts/shared.xcframework/ios-arm64/shared.framework/shared new file mode 100755 index 0000000..fe8cee7 Binary files /dev/null and b/iosApp/Modules/Artifacts/shared.xcframework/ios-arm64/shared.framework/shared differ diff --git a/iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator/shared.framework.dSYM/Contents/Info.plist b/iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator/shared.framework.dSYM/Contents/Info.plist new file mode 100644 index 0000000..19e854c --- /dev/null +++ b/iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator/shared.framework.dSYM/Contents/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleIdentifier + com.apple.xcode.dsym.com.jetbrains.kmm.shared.shared + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + dSYM + CFBundleSignature + ???? + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator/shared.framework.dSYM/Contents/Resources/DWARF/shared b/iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator/shared.framework.dSYM/Contents/Resources/DWARF/shared new file mode 100644 index 0000000..40d2693 Binary files /dev/null and b/iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator/shared.framework.dSYM/Contents/Resources/DWARF/shared differ diff --git a/iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator/shared.framework/Headers/shared.h b/iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator/shared.framework/Headers/shared.h new file mode 100644 index 0000000..6514103 --- /dev/null +++ b/iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator/shared.framework/Headers/shared.h @@ -0,0 +1,181 @@ +#import +#import +#import +#import +#import +#import +#import + +@class SharedCalculatorCompanion; + +NS_ASSUME_NONNULL_BEGIN +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunknown-warning-option" +#pragma clang diagnostic ignored "-Wincompatible-property-type" +#pragma clang diagnostic ignored "-Wnullability" + +#pragma push_macro("_Nullable_result") +#if !__has_feature(nullability_nullable_result) +#undef _Nullable_result +#define _Nullable_result _Nullable +#endif + +__attribute__((swift_name("KotlinBase"))) +@interface SharedBase : NSObject +- (instancetype)init __attribute__((unavailable)); ++ (instancetype)new __attribute__((unavailable)); ++ (void)initialize __attribute__((objc_requires_super)); +@end + +@interface SharedBase (SharedBaseCopying) +@end + +__attribute__((swift_name("KotlinMutableSet"))) +@interface SharedMutableSet : NSMutableSet +@end + +__attribute__((swift_name("KotlinMutableDictionary"))) +@interface SharedMutableDictionary : NSMutableDictionary +@end + +@interface NSError (NSErrorSharedKotlinException) +@property (readonly) id _Nullable kotlinException; +@end + +__attribute__((swift_name("KotlinNumber"))) +@interface SharedNumber : NSNumber +- (instancetype)initWithChar:(char)value __attribute__((unavailable)); +- (instancetype)initWithUnsignedChar:(unsigned char)value __attribute__((unavailable)); +- (instancetype)initWithShort:(short)value __attribute__((unavailable)); +- (instancetype)initWithUnsignedShort:(unsigned short)value __attribute__((unavailable)); +- (instancetype)initWithInt:(int)value __attribute__((unavailable)); +- (instancetype)initWithUnsignedInt:(unsigned int)value __attribute__((unavailable)); +- (instancetype)initWithLong:(long)value __attribute__((unavailable)); +- (instancetype)initWithUnsignedLong:(unsigned long)value __attribute__((unavailable)); +- (instancetype)initWithLongLong:(long long)value __attribute__((unavailable)); +- (instancetype)initWithUnsignedLongLong:(unsigned long long)value __attribute__((unavailable)); +- (instancetype)initWithFloat:(float)value __attribute__((unavailable)); +- (instancetype)initWithDouble:(double)value __attribute__((unavailable)); +- (instancetype)initWithBool:(BOOL)value __attribute__((unavailable)); +- (instancetype)initWithInteger:(NSInteger)value __attribute__((unavailable)); +- (instancetype)initWithUnsignedInteger:(NSUInteger)value __attribute__((unavailable)); ++ (instancetype)numberWithChar:(char)value __attribute__((unavailable)); ++ (instancetype)numberWithUnsignedChar:(unsigned char)value __attribute__((unavailable)); ++ (instancetype)numberWithShort:(short)value __attribute__((unavailable)); ++ (instancetype)numberWithUnsignedShort:(unsigned short)value __attribute__((unavailable)); ++ (instancetype)numberWithInt:(int)value __attribute__((unavailable)); ++ (instancetype)numberWithUnsignedInt:(unsigned int)value __attribute__((unavailable)); ++ (instancetype)numberWithLong:(long)value __attribute__((unavailable)); ++ (instancetype)numberWithUnsignedLong:(unsigned long)value __attribute__((unavailable)); ++ (instancetype)numberWithLongLong:(long long)value __attribute__((unavailable)); ++ (instancetype)numberWithUnsignedLongLong:(unsigned long long)value __attribute__((unavailable)); ++ (instancetype)numberWithFloat:(float)value __attribute__((unavailable)); ++ (instancetype)numberWithDouble:(double)value __attribute__((unavailable)); ++ (instancetype)numberWithBool:(BOOL)value __attribute__((unavailable)); ++ (instancetype)numberWithInteger:(NSInteger)value __attribute__((unavailable)); ++ (instancetype)numberWithUnsignedInteger:(NSUInteger)value __attribute__((unavailable)); +@end + +__attribute__((swift_name("KotlinByte"))) +@interface SharedByte : SharedNumber +- (instancetype)initWithChar:(char)value; ++ (instancetype)numberWithChar:(char)value; +@end + +__attribute__((swift_name("KotlinUByte"))) +@interface SharedUByte : SharedNumber +- (instancetype)initWithUnsignedChar:(unsigned char)value; ++ (instancetype)numberWithUnsignedChar:(unsigned char)value; +@end + +__attribute__((swift_name("KotlinShort"))) +@interface SharedShort : SharedNumber +- (instancetype)initWithShort:(short)value; ++ (instancetype)numberWithShort:(short)value; +@end + +__attribute__((swift_name("KotlinUShort"))) +@interface SharedUShort : SharedNumber +- (instancetype)initWithUnsignedShort:(unsigned short)value; ++ (instancetype)numberWithUnsignedShort:(unsigned short)value; +@end + +__attribute__((swift_name("KotlinInt"))) +@interface SharedInt : SharedNumber +- (instancetype)initWithInt:(int)value; ++ (instancetype)numberWithInt:(int)value; +@end + +__attribute__((swift_name("KotlinUInt"))) +@interface SharedUInt : SharedNumber +- (instancetype)initWithUnsignedInt:(unsigned int)value; ++ (instancetype)numberWithUnsignedInt:(unsigned int)value; +@end + +__attribute__((swift_name("KotlinLong"))) +@interface SharedLong : SharedNumber +- (instancetype)initWithLongLong:(long long)value; ++ (instancetype)numberWithLongLong:(long long)value; +@end + +__attribute__((swift_name("KotlinULong"))) +@interface SharedULong : SharedNumber +- (instancetype)initWithUnsignedLongLong:(unsigned long long)value; ++ (instancetype)numberWithUnsignedLongLong:(unsigned long long)value; +@end + +__attribute__((swift_name("KotlinFloat"))) +@interface SharedFloat : SharedNumber +- (instancetype)initWithFloat:(float)value; ++ (instancetype)numberWithFloat:(float)value; +@end + +__attribute__((swift_name("KotlinDouble"))) +@interface SharedDouble : SharedNumber +- (instancetype)initWithDouble:(double)value; ++ (instancetype)numberWithDouble:(double)value; +@end + +__attribute__((swift_name("KotlinBoolean"))) +@interface SharedBoolean : SharedNumber +- (instancetype)initWithBool:(BOOL)value; ++ (instancetype)numberWithBool:(BOOL)value; +@end + +__attribute__((objc_subclassing_restricted)) +__attribute__((swift_name("Calculator"))) +@interface SharedCalculator : SharedBase +- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer)); ++ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead"))); +@property (class, readonly, getter=companion) SharedCalculatorCompanion *companion __attribute__((swift_name("companion"))); +@end + +__attribute__((objc_subclassing_restricted)) +__attribute__((swift_name("Calculator.Companion"))) +@interface SharedCalculatorCompanion : SharedBase ++ (instancetype)alloc __attribute__((unavailable)); ++ (instancetype)allocWithZone:(struct _NSZone *)zone __attribute__((unavailable)); ++ (instancetype)companion __attribute__((swift_name("init()"))); +@property (class, readonly, getter=shared) SharedCalculatorCompanion *shared __attribute__((swift_name("shared"))); +- (int32_t)sumA:(int32_t)a b:(int32_t)b __attribute__((swift_name("sum(a:b:)"))); +@end + +__attribute__((objc_subclassing_restricted)) +__attribute__((swift_name("Greeting"))) +@interface SharedGreeting : SharedBase +- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer)); ++ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead"))); +- (NSString *)greeting __attribute__((swift_name("greeting()"))); +@end + +__attribute__((objc_subclassing_restricted)) +__attribute__((swift_name("Platform"))) +@interface SharedPlatform : SharedBase +- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer)); ++ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead"))); +@property (readonly) NSString *platform __attribute__((swift_name("platform"))); +@end + +#pragma pop_macro("_Nullable_result") +#pragma clang diagnostic pop +NS_ASSUME_NONNULL_END diff --git a/iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator/shared.framework/Info.plist b/iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator/shared.framework/Info.plist new file mode 100644 index 0000000..322afe6 --- /dev/null +++ b/iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator/shared.framework/Info.plist @@ -0,0 +1,31 @@ + + + + + CFBundleExecutable + shared + CFBundleIdentifier + com.jetbrains.kmm.shared.shared + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + shared + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSupportedPlatforms + + iPhoneSimulator + + CFBundleVersion + 1 + MinimumOSVersion + 9.0 + UIDeviceFamily + + 1 + 2 + + + \ No newline at end of file diff --git a/iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator/shared.framework/Modules/module.modulemap b/iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator/shared.framework/Modules/module.modulemap new file mode 100644 index 0000000..5f942b3 --- /dev/null +++ b/iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator/shared.framework/Modules/module.modulemap @@ -0,0 +1,8 @@ +framework module shared { + umbrella header "shared.h" + + export * + module * { export * } + + use Foundation +} diff --git a/iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator/shared.framework/shared b/iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator/shared.framework/shared new file mode 100755 index 0000000..0a43fc6 Binary files /dev/null and b/iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator/shared.framework/shared differ diff --git a/iosApp/Modules/Package.swift b/iosApp/Modules/Package.swift new file mode 100644 index 0000000..4c70bb3 --- /dev/null +++ b/iosApp/Modules/Package.swift @@ -0,0 +1,36 @@ +// swift-tools-version:5.7 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "Modules", + defaultLocalization: "ru", + platforms: [ + .iOS(.v14) + ], + + // MARK: - Products + + products: [ + + // MARK: - Main Products + + .library( + name: "iosAppDependenciesUmbrella", + type: .dynamic, + targets: [ + "Dummy", + "shared", + ] + ), + ], + + targets: [ + .binaryTarget( + name: "shared", + path: "artifacts/shared.xcframework" + ), + .target(name: "Dummy") + ] +) diff --git a/iosApp/Modules/Sources/Dummy/Dummy.swift b/iosApp/Modules/Sources/Dummy/Dummy.swift new file mode 100644 index 0000000..fecc4ab --- /dev/null +++ b/iosApp/Modules/Sources/Dummy/Dummy.swift @@ -0,0 +1 @@ +import Foundation diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj index 75401df..1d48341 100644 --- a/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/iosApp/iosApp.xcodeproj/project.pbxproj @@ -3,135 +3,80 @@ archiveVersion = 1; classes = { }; - objectVersion = 53; + objectVersion = 56; objects = { /* Begin PBXBuildFile section */ - 66CD08CE2A407C2900D66EFD /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66CD08CD2A407C2900D66EFD /* iOSApp.swift */; }; - 7555FF83242A565900829871 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* ContentView.swift */; }; - 7555FF85242A565B00829871 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7555FF84242A565B00829871 /* Assets.xcassets */; }; - 7555FF88242A565B00829871 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7555FF87242A565B00829871 /* Preview Assets.xcassets */; }; - 7555FF96242A565B00829871 /* iosAppTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF95242A565B00829871 /* iosAppTests.swift */; }; - 7555FFA1242A565B00829871 /* iosAppUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FFA0242A565B00829871 /* iosAppUITests.swift */; }; + A201E3982A304B7100C0C23F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A201E3972A304B7100C0C23F /* Assets.xcassets */; }; + A201E3A32A304BBA00C0C23F /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A201E3A22A304BBA00C0C23F /* ContentView.swift */; }; + A201E3A62A304BF900C0C23F /* iosAppDependenciesUmbrella in Frameworks */ = {isa = PBXBuildFile; productRef = A201E3A52A304BF900C0C23F /* iosAppDependenciesUmbrella */; }; + A201E3A72A304BF900C0C23F /* iosAppDependenciesUmbrella in Embed Frameworks */ = {isa = PBXBuildFile; productRef = A201E3A52A304BF900C0C23F /* iosAppDependenciesUmbrella */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + A2FD11872A5296F00050EEC6 /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2FD11862A5296F00050EEC6 /* iOSApp.swift */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 7555FF92242A565B00829871 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7555FF73242A565900829871 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 7555FF7A242A565900829871; - remoteInfo = iosApp; - }; - 7555FF9D242A565B00829871 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7555FF73242A565900829871 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 7555FF7A242A565900829871; - remoteInfo = iosApp; +/* Begin PBXCopyFilesBuildPhase section */ + A201E3A82A304BF900C0C23F /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + A201E3A72A304BF900C0C23F /* iosAppDependenciesUmbrella in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; }; -/* End PBXContainerItemProxy section */ +/* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 66CD08CD2A407C2900D66EFD /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = ""; }; - 7555FF7B242A565900829871 /* iosApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iosApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; - 7555FF84242A565B00829871 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 7555FF87242A565B00829871 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; - 7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 7555FF91242A565B00829871 /* iosAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iosAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 7555FF95242A565B00829871 /* iosAppTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosAppTests.swift; sourceTree = ""; }; - 7555FF97242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 7555FF9C242A565B00829871 /* iosAppUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iosAppUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 7555FFA0242A565B00829871 /* iosAppUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosAppUITests.swift; sourceTree = ""; }; - 7555FFA2242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + A201E38B2A304B7000C0C23F /* iosApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iosApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; + A201E3972A304B7100C0C23F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + A201E39C2A304B7100C0C23F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + A201E3A22A304BBA00C0C23F /* ContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; + A2FD11862A5296F00050EEC6 /* iOSApp.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 7555FF78242A565900829871 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 7555FF8E242A565B00829871 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 7555FF99242A565B00829871 /* Frameworks */ = { + A201E3882A304B7000C0C23F /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + A201E3A62A304BF900C0C23F /* iosAppDependenciesUmbrella in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 7555FF72242A565900829871 = { + A201E3822A304B7000C0C23F = { isa = PBXGroup; children = ( - 7555FF7D242A565900829871 /* iosApp */, - 7555FF94242A565B00829871 /* iosAppTests */, - 7555FF9F242A565B00829871 /* iosAppUITests */, - 7555FF7C242A565900829871 /* Products */, - 7555FFB0242A642200829871 /* Frameworks */, + A201E38D2A304B7000C0C23F /* iosApp */, + A201E38C2A304B7000C0C23F /* Products */, + A201E3A42A304BF900C0C23F /* Frameworks */, ); sourceTree = ""; }; - 7555FF7C242A565900829871 /* Products */ = { + A201E38C2A304B7000C0C23F /* Products */ = { isa = PBXGroup; children = ( - 7555FF7B242A565900829871 /* iosApp.app */, - 7555FF91242A565B00829871 /* iosAppTests.xctest */, - 7555FF9C242A565B00829871 /* iosAppUITests.xctest */, + A201E38B2A304B7000C0C23F /* iosApp.app */, ); name = Products; sourceTree = ""; }; - 7555FF7D242A565900829871 /* iosApp */ = { + A201E38D2A304B7000C0C23F /* iosApp */ = { isa = PBXGroup; children = ( - 7555FF82242A565900829871 /* ContentView.swift */, - 7555FF84242A565B00829871 /* Assets.xcassets */, - 7555FF8C242A565B00829871 /* Info.plist */, - 7555FF86242A565B00829871 /* Preview Content */, - 66CD08CD2A407C2900D66EFD /* iOSApp.swift */, + A2FD11862A5296F00050EEC6 /* iOSApp.swift */, + A201E3A22A304BBA00C0C23F /* ContentView.swift */, + A201E3972A304B7100C0C23F /* Assets.xcassets */, + A201E39C2A304B7100C0C23F /* Info.plist */, ); path = iosApp; sourceTree = ""; }; - 7555FF86242A565B00829871 /* Preview Content */ = { - isa = PBXGroup; - children = ( - 7555FF87242A565B00829871 /* Preview Assets.xcassets */, - ); - path = "Preview Content"; - sourceTree = ""; - }; - 7555FF94242A565B00829871 /* iosAppTests */ = { - isa = PBXGroup; - children = ( - 7555FF95242A565B00829871 /* iosAppTests.swift */, - 7555FF97242A565B00829871 /* Info.plist */, - ); - path = iosAppTests; - sourceTree = ""; - }; - 7555FF9F242A565B00829871 /* iosAppUITests */ = { - isa = PBXGroup; - children = ( - 7555FFA0242A565B00829871 /* iosAppUITests.swift */, - 7555FFA2242A565B00829871 /* Info.plist */, - ); - path = iosAppUITests; - sourceTree = ""; - }; - 7555FFB0242A642200829871 /* Frameworks */ = { + A201E3A42A304BF900C0C23F /* Frameworks */ = { isa = PBXGroup; children = ( ); @@ -141,201 +86,91 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 7555FF7A242A565900829871 /* iosApp */ = { + A201E38A2A304B7000C0C23F /* iosApp */ = { isa = PBXNativeTarget; - buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */; + buildConfigurationList = A201E39F2A304B7100C0C23F /* Build configuration list for PBXNativeTarget "iosApp" */; buildPhases = ( - 7555FFB5242A651A00829871 /* Run Script */, - 7555FF77242A565900829871 /* Sources */, - 7555FF78242A565900829871 /* Frameworks */, - 7555FF79242A565900829871 /* Resources */, + A201E3872A304B7000C0C23F /* Sources */, + A201E3882A304B7000C0C23F /* Frameworks */, + A201E3892A304B7000C0C23F /* Resources */, + A201E3A82A304BF900C0C23F /* Embed Frameworks */, ); buildRules = ( ); dependencies = ( ); name = iosApp; + packageProductDependencies = ( + A201E3A52A304BF900C0C23F /* iosAppDependenciesUmbrella */, + ); productName = iosApp; - productReference = 7555FF7B242A565900829871 /* iosApp.app */; + productReference = A201E38B2A304B7000C0C23F /* iosApp.app */; productType = "com.apple.product-type.application"; }; - 7555FF90242A565B00829871 /* iosAppTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 7555FFA8242A565B00829871 /* Build configuration list for PBXNativeTarget "iosAppTests" */; - buildPhases = ( - 7555FF8D242A565B00829871 /* Sources */, - 7555FF8E242A565B00829871 /* Frameworks */, - 7555FF8F242A565B00829871 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 7555FF93242A565B00829871 /* PBXTargetDependency */, - ); - name = iosAppTests; - productName = iosAppTests; - productReference = 7555FF91242A565B00829871 /* iosAppTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - 7555FF9B242A565B00829871 /* iosAppUITests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 7555FFAB242A565B00829871 /* Build configuration list for PBXNativeTarget "iosAppUITests" */; - buildPhases = ( - 7555FF98242A565B00829871 /* Sources */, - 7555FF99242A565B00829871 /* Frameworks */, - 7555FF9A242A565B00829871 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 7555FF9E242A565B00829871 /* PBXTargetDependency */, - ); - name = iosAppUITests; - productName = iosAppUITests; - productReference = 7555FF9C242A565B00829871 /* iosAppUITests.xctest */; - productType = "com.apple.product-type.bundle.ui-testing"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 7555FF73242A565900829871 /* Project object */ = { + A201E3832A304B7000C0C23F /* Project object */ = { isa = PBXProject; attributes = { - BuildIndependentTargetsInParallel = YES; - LastSwiftUpdateCheck = 1130; - LastUpgradeCheck = 1430; - ORGANIZATIONNAME = orgName; + BuildIndependentTargetsInParallel = 1; + LastSwiftUpdateCheck = 1420; + LastUpgradeCheck = 1420; TargetAttributes = { - 7555FF7A242A565900829871 = { - CreatedOnToolsVersion = 11.3.1; - }; - 7555FF90242A565B00829871 = { - CreatedOnToolsVersion = 11.3.1; - TestTargetID = 7555FF7A242A565900829871; - }; - 7555FF9B242A565B00829871 = { - CreatedOnToolsVersion = 11.3.1; - TestTargetID = 7555FF7A242A565900829871; + A201E38A2A304B7000C0C23F = { + CreatedOnToolsVersion = 14.2; }; }; }; - buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */; - compatibilityVersion = "Xcode 9.3"; + buildConfigurationList = A201E3862A304B7000C0C23F /* Build configuration list for PBXProject "iosApp" */; + compatibilityVersion = "Xcode 14.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, Base, ); - mainGroup = 7555FF72242A565900829871; - productRefGroup = 7555FF7C242A565900829871 /* Products */; + mainGroup = A201E3822A304B7000C0C23F; + productRefGroup = A201E38C2A304B7000C0C23F /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 7555FF7A242A565900829871 /* iosApp */, - 7555FF90242A565B00829871 /* iosAppTests */, - 7555FF9B242A565B00829871 /* iosAppUITests */, + A201E38A2A304B7000C0C23F /* iosApp */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 7555FF79242A565900829871 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 7555FF88242A565B00829871 /* Preview Assets.xcassets in Resources */, - 7555FF85242A565B00829871 /* Assets.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 7555FF8F242A565B00829871 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 7555FF9A242A565B00829871 /* Resources */ = { + A201E3892A304B7000C0C23F /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + A201E3982A304B7100C0C23F /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 7555FFB5242A651A00829871 /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n"; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ - 7555FF77242A565900829871 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 7555FF83242A565900829871 /* ContentView.swift in Sources */, - 66CD08CE2A407C2900D66EFD /* iOSApp.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 7555FF8D242A565B00829871 /* Sources */ = { + A201E3872A304B7000C0C23F /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 7555FF96242A565B00829871 /* iosAppTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 7555FF98242A565B00829871 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 7555FFA1242A565B00829871 /* iosAppUITests.swift in Sources */, + A201E3A32A304BBA00C0C23F /* ContentView.swift in Sources */, + A2FD11872A5296F00050EEC6 /* iOSApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 7555FF93242A565B00829871 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 7555FF7A242A565900829871 /* iosApp */; - targetProxy = 7555FF92242A565B00829871 /* PBXContainerItemProxy */; - }; - 7555FF9E242A565B00829871 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 7555FF7A242A565900829871 /* iosApp */; - targetProxy = 7555FF9D242A565B00829871 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ - 7555FFA3242A565B00829871 /* Debug */ = { + A201E39D2A304B7100C0C23F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_WEAK = YES; @@ -362,7 +197,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -379,7 +214,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.2; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -389,14 +224,13 @@ }; name = Debug; }; - 7555FFA4242A565B00829871 /* Release */ = { + A201E39E2A304B7100C0C23F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_WEAK = YES; @@ -434,7 +268,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.2; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -444,178 +278,91 @@ }; name = Release; }; - 7555FFA6242A565B00829871 /* Debug */ = { + A201E3A02A304B7100C0C23F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\""; - ENABLE_PREVIEWS = YES; - FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)"; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = WWR4YB72U6; + GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = iosApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; + INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; + INFOPLIST_KEY_UIMainStoryboardFile = Main; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-framework", - shared, - ); - PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.iosApp; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.dmz.iosApp; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; - 7555FFA7242A565B00829871 /* Release */ = { + A201E3A12A304B7100C0C23F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\""; - ENABLE_PREVIEWS = YES; - FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)"; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = WWR4YB72U6; + GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = iosApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-framework", - shared, - ); - PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.iosApp; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - 7555FFA9242A565B00829871 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = iosAppTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.iosAppTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iosApp.app/iosApp"; - }; - name = Debug; - }; - 7555FFAA242A565B00829871 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = iosAppTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; + INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; + INFOPLIST_KEY_UIMainStoryboardFile = Main; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", - "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.iosAppTests; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.dmz.iosApp; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iosApp.app/iosApp"; - }; - name = Release; - }; - 7555FFAC242A565B00829871 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = iosAppUITests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.iosAppUITests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_TARGET_NAME = iosApp; - }; - name = Debug; - }; - 7555FFAD242A565B00829871 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = iosAppUITests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.iosAppUITests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_TARGET_NAME = iosApp; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */ = { + A201E3862A304B7000C0C23F /* Build configuration list for PBXProject "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( - 7555FFA3242A565B00829871 /* Debug */, - 7555FFA4242A565B00829871 /* Release */, + A201E39D2A304B7100C0C23F /* Debug */, + A201E39E2A304B7100C0C23F /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */ = { + A201E39F2A304B7100C0C23F /* Build configuration list for PBXNativeTarget "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( - 7555FFA6242A565B00829871 /* Debug */, - 7555FFA7242A565B00829871 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 7555FFA8242A565B00829871 /* Build configuration list for PBXNativeTarget "iosAppTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 7555FFA9242A565B00829871 /* Debug */, - 7555FFAA242A565B00829871 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 7555FFAB242A565B00829871 /* Build configuration list for PBXNativeTarget "iosAppUITests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 7555FFAC242A565B00829871 /* Debug */, - 7555FFAD242A565B00829871 /* Release */, + A201E3A02A304B7100C0C23F /* Debug */, + A201E3A12A304B7100C0C23F /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCSwiftPackageProductDependency section */ + A201E3A52A304BF900C0C23F /* iosAppDependenciesUmbrella */ = { + isa = XCSwiftPackageProductDependency; + productName = iosAppDependenciesUmbrella; + }; +/* End XCSwiftPackageProductDependency section */ }; - rootObject = 7555FF73242A565900829871 /* Project object */; + rootObject = A201E3832A304B7000C0C23F /* Project object */; } diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/Ekaterina.Petrova.xcuserdatad/UserInterfaceState.xcuserstate b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/Ekaterina.Petrova.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 9eaeb3d..0000000 Binary files a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/Ekaterina.Petrova.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/iosApp/iosApp.xcworkspace/contents.xcworkspacedata b/iosApp/iosApp.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..0a19ebf --- /dev/null +++ b/iosApp/iosApp.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/iosApp/iosApp.xcodeproj/xcuserdata/Ekaterina.Petrova.xcuserdatad/xcschemes/xcschememanagement.plist b/iosApp/iosApp.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 55% rename from iosApp/iosApp.xcodeproj/xcuserdata/Ekaterina.Petrova.xcuserdatad/xcschemes/xcschememanagement.plist rename to iosApp/iosApp.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist index 56b5955..18d9810 100644 --- a/iosApp/iosApp.xcodeproj/xcuserdata/Ekaterina.Petrova.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/iosApp/iosApp.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -2,13 +2,7 @@ - SchemeUserState - - iosApp.xcscheme_^#shared#^_ - - orderHint - 0 - - + IDEDidComputeMac32BitWarning + diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 59d347b..59abfbc 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -37,6 +37,18 @@ kotlin { implementation("junit:junit:4.13.2") } } + + tasks.register("makeXCFramework-arm64") { + dependsOn("build") + from(layout.buildDirectory.dir("bin/iosArm64/debugFramework")) + into(layout.buildDirectory.dir("../../iosApp/Modules/Artifacts/shared.xcframework/ios-arm64")) + } + + tasks.register("makeXCFramework-simulator") { + dependsOn("build") + from(layout.buildDirectory.dir("bin/iosSimulatorArm64/debugFramework")) + into(layout.buildDirectory.dir("../../iosApp/Modules/Artifacts/shared.xcframework/ios-x86_64_arm64-simulator")) + } } }