From 1c1248f514419f869244fd4b4dc831bbf01be13e Mon Sep 17 00:00:00 2001 From: Baptiste Candellier Date: Fri, 27 Sep 2024 17:33:11 +0200 Subject: [PATCH 1/9] Build iOS app with Tuist --- app-ios/.gitignore | 2 + app-ios/.mise.toml | 2 + .../project.pbxproj | 426 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcschemes/JustChatting.xcscheme | 79 ++++ .../.tuist-generated | 0 .../contents.xcworkspacedata | 7 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + .../JustChatting-Tuist-Workspace.xcscheme | 78 ++++ .../JustChatting.xcodeproj/project.pbxproj | 48 +- .../Preview Assets.xcassets/Contents.json | 4 - .../AccentColor.colorset/Contents.json | 0 .../AppIcon.appiconset/1024 1.png | Bin .../AppIcon.appiconset/Contents.json | 0 .../AppIcon.appiconset/dark.png | Bin .../AppIcon.appiconset/icon_monochrome.png | Bin .../Assets.xcassets/Contents.json | 0 .../LogoForeground.imageset/Contents.json | 0 .../LogoForeground.png | Bin .../LogoForeground@2x.png | Bin .../LogoForeground@3x.png | Bin .../{ => Resources}/Launch Screen.storyboard | 0 .../{ => Sources}/ComposeBridgeView.swift | 0 .../JustChatting/{ => Sources}/MainView.swift | 0 .../JustChatting/{ => Sources}/iOSApp.swift | 0 app-ios/Project.swift | 48 ++ app-ios/Tuist/Config.swift | 3 + app-ios/Tuist/Package.swift | 22 + .../preferences/domain/AuthRepository.kt | 3 +- 29 files changed, 696 insertions(+), 41 deletions(-) create mode 100644 app-ios/.mise.toml create mode 100644 app-ios/JustChatting-Tuist.xcodeproj/project.pbxproj create mode 100644 app-ios/JustChatting-Tuist.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 app-ios/JustChatting-Tuist.xcodeproj/xcshareddata/xcschemes/JustChatting.xcscheme create mode 100644 app-ios/JustChatting-Tuist.xcworkspace/.tuist-generated create mode 100644 app-ios/JustChatting-Tuist.xcworkspace/contents.xcworkspacedata create mode 100644 app-ios/JustChatting-Tuist.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 app-ios/JustChatting-Tuist.xcworkspace/xcshareddata/xcschemes/JustChatting-Tuist-Workspace.xcscheme delete mode 100644 app-ios/JustChatting/Preview Content/Preview Assets.xcassets/Contents.json rename app-ios/JustChatting/{ => Resources}/Assets.xcassets/AccentColor.colorset/Contents.json (100%) rename app-ios/JustChatting/{ => Resources}/Assets.xcassets/AppIcon.appiconset/1024 1.png (100%) rename app-ios/JustChatting/{ => Resources}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename app-ios/JustChatting/{ => Resources}/Assets.xcassets/AppIcon.appiconset/dark.png (100%) rename app-ios/JustChatting/{ => Resources}/Assets.xcassets/AppIcon.appiconset/icon_monochrome.png (100%) rename app-ios/JustChatting/{ => Resources}/Assets.xcassets/Contents.json (100%) rename app-ios/JustChatting/{ => Resources}/Assets.xcassets/LogoForeground.imageset/Contents.json (100%) rename app-ios/JustChatting/{ => Resources}/Assets.xcassets/LogoForeground.imageset/LogoForeground.png (100%) rename app-ios/JustChatting/{ => Resources}/Assets.xcassets/LogoForeground.imageset/LogoForeground@2x.png (100%) rename app-ios/JustChatting/{ => Resources}/Assets.xcassets/LogoForeground.imageset/LogoForeground@3x.png (100%) rename app-ios/JustChatting/{ => Resources}/Launch Screen.storyboard (100%) rename app-ios/JustChatting/{ => Sources}/ComposeBridgeView.swift (100%) rename app-ios/JustChatting/{ => Sources}/MainView.swift (100%) rename app-ios/JustChatting/{ => Sources}/iOSApp.swift (100%) create mode 100644 app-ios/Project.swift create mode 100644 app-ios/Tuist/Config.swift create mode 100644 app-ios/Tuist/Package.swift diff --git a/app-ios/.gitignore b/app-ios/.gitignore index 4de788160..f043e232f 100644 --- a/app-ios/.gitignore +++ b/app-ios/.gitignore @@ -90,3 +90,5 @@ fastlane/test_output iOSInjectionProject/ +# Tuist +Derived/ diff --git a/app-ios/.mise.toml b/app-ios/.mise.toml new file mode 100644 index 000000000..272f495b9 --- /dev/null +++ b/app-ios/.mise.toml @@ -0,0 +1,2 @@ +[tools] +tuist = "latest" diff --git a/app-ios/JustChatting-Tuist.xcodeproj/project.pbxproj b/app-ios/JustChatting-Tuist.xcodeproj/project.pbxproj new file mode 100644 index 000000000..94fa14123 --- /dev/null +++ b/app-ios/JustChatting-Tuist.xcodeproj/project.pbxproj @@ -0,0 +1,426 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 55; + objects = { + +/* Begin PBXBuildFile section */ + 03FC03514554721DDC88484C /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B66540879C6527242006291 /* MainView.swift */; }; + 11AF76F34A88B134DAA64C94 /* ComposeBridgeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE815B0A8230EF305658C175 /* ComposeBridgeView.swift */; }; + 1C6E705F5CE0D0F74B61DF0E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E054997681B0105A5D65870 /* iOSApp.swift */; }; + 585B1E677280E0A519AF6085 /* TuistBundle+JustChatting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E6750D16DB3952AD30CBFE8 /* TuistBundle+JustChatting.swift */; }; + 7C4CF400872E7BF8ADB0D661 /* TuistAssets+JustChatting.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64C9D2F9EFE6A6EA4314F9F /* TuistAssets+JustChatting.swift */; }; + 99878FB0B2186BB5E72BFDE9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B5E2DB0FA8B2C929CD373672 /* Assets.xcassets */; }; + CD74898B5D21637ACC7A30A1 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8273C0057B157A249451F2A7 /* Launch Screen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + FC68A0561E3F539E18ACBB58 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 3E054997681B0105A5D65870 /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = ""; }; + 4B66540879C6527242006291 /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = ""; }; + 7E3777AF1723961884EBA3E5 /* JustChatting.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JustChatting.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 7E6750D16DB3952AD30CBFE8 /* TuistBundle+JustChatting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TuistBundle+JustChatting.swift"; sourceTree = ""; }; + 8273C0057B157A249451F2A7 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = ""; }; + B5E2DB0FA8B2C929CD373672 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + CC8C6F11D506DCA6E335F13F /* JustChatting-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "JustChatting-Info.plist"; sourceTree = ""; }; + D64C9D2F9EFE6A6EA4314F9F /* TuistAssets+JustChatting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TuistAssets+JustChatting.swift"; sourceTree = ""; }; + EE815B0A8230EF305658C175 /* ComposeBridgeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeBridgeView.swift; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + F8408B9B4AE723860AFD521A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 06D158E545E126D757137EBB /* Products */ = { + isa = PBXGroup; + children = ( + 7E3777AF1723961884EBA3E5 /* JustChatting.app */, + ); + name = Products; + sourceTree = ""; + }; + 3E4E77487A8C06D8CE57592B /* Sources */ = { + isa = PBXGroup; + children = ( + EE815B0A8230EF305658C175 /* ComposeBridgeView.swift */, + 3E054997681B0105A5D65870 /* iOSApp.swift */, + 4B66540879C6527242006291 /* MainView.swift */, + ); + path = Sources; + sourceTree = ""; + }; + 648195497F5DD836E2110346 /* Sources */ = { + isa = PBXGroup; + children = ( + D64C9D2F9EFE6A6EA4314F9F /* TuistAssets+JustChatting.swift */, + 7E6750D16DB3952AD30CBFE8 /* TuistBundle+JustChatting.swift */, + ); + path = Sources; + sourceTree = ""; + }; + 65E55140816B753D418EADDE /* Resources */ = { + isa = PBXGroup; + children = ( + B5E2DB0FA8B2C929CD373672 /* Assets.xcassets */, + 8273C0057B157A249451F2A7 /* Launch Screen.storyboard */, + ); + path = Resources; + sourceTree = ""; + }; + 7FEF3BBC1B5228614976654F /* Derived */ = { + isa = PBXGroup; + children = ( + CB9460D3AAFA50D5ED7F8ADA /* InfoPlists */, + 648195497F5DD836E2110346 /* Sources */, + ); + path = Derived; + sourceTree = ""; + }; + A8BDEC9498B7445615DBD899 /* JustChatting */ = { + isa = PBXGroup; + children = ( + 65E55140816B753D418EADDE /* Resources */, + 3E4E77487A8C06D8CE57592B /* Sources */, + ); + path = JustChatting; + sourceTree = ""; + }; + C62598EF3D3196902491645E = { + isa = PBXGroup; + children = ( + EC00916EF8EE19E7B8DBA6B9 /* Project */, + 06D158E545E126D757137EBB /* Products */, + ); + sourceTree = ""; + }; + CB9460D3AAFA50D5ED7F8ADA /* InfoPlists */ = { + isa = PBXGroup; + children = ( + CC8C6F11D506DCA6E335F13F /* JustChatting-Info.plist */, + ); + path = InfoPlists; + sourceTree = ""; + }; + EC00916EF8EE19E7B8DBA6B9 /* Project */ = { + isa = PBXGroup; + children = ( + 7FEF3BBC1B5228614976654F /* Derived */, + A8BDEC9498B7445615DBD899 /* JustChatting */, + ); + name = Project; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + FD67AF8A31CB9E24A8AD388C /* JustChatting */ = { + isa = PBXNativeTarget; + buildConfigurationList = 4D569C905677CBE60E5531C0 /* Build configuration list for PBXNativeTarget "JustChatting" */; + buildPhases = ( + 0375C38FBACEA1C5105586E5 /* Generate shared framework */, + C0CAC03143B039B1238DA47F /* Sources */, + 8CF34ED1DBE273A26D23D1E9 /* Resources */, + FC68A0561E3F539E18ACBB58 /* Embed Frameworks */, + F8408B9B4AE723860AFD521A /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = JustChatting; + productName = JustChatting; + productReference = 7E3777AF1723961884EBA3E5 /* JustChatting.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + F256665F95714AA9A9E85DFF /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + TargetAttributes = { + }; + }; + buildConfigurationList = 57E138AE30E0610C0BED3A82 /* Build configuration list for PBXProject "JustChatting-Tuist" */; + compatibilityVersion = "Xcode 14.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + Base, + en, + ); + mainGroup = C62598EF3D3196902491645E; + productRefGroup = 06D158E545E126D757137EBB /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + FD67AF8A31CB9E24A8AD388C /* JustChatting */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 8CF34ED1DBE273A26D23D1E9 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 99878FB0B2186BB5E72BFDE9 /* Assets.xcassets in Resources */, + CD74898B5D21637ACC7A30A1 /* Launch Screen.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 0375C38FBACEA1C5105586E5 /* Generate shared framework */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Generate shared framework"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cd \"$SRCROOT/..\" && ./gradlew :shared:embedAndSignAppleFrameworkForXcode"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + C0CAC03143B039B1238DA47F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 7C4CF400872E7BF8ADB0D661 /* TuistAssets+JustChatting.swift in Sources */, + 585B1E677280E0A519AF6085 /* TuistBundle+JustChatting.swift in Sources */, + 11AF76F34A88B134DAA64C94 /* ComposeBridgeView.swift in Sources */, + 03FC03514554721DDC88484C /* MainView.swift in Sources */, + 1C6E705F5CE0D0F74B61DF0E /* iOSApp.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 02D14453E061B96CB372EDA7 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)"; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 42ED6E89084B81FA176D66F2 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_IDENTITY = "iPhone Developer"; + ENABLE_PREVIEWS = YES; + INFOPLIST_FILE = "Derived/InfoPlists/JustChatting-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 17.0.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = fr.outadoc.justchatting; + PRODUCT_NAME = JustChatting; + SDKROOT = iphoneos; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; + 5D92DFFDCBF361AD66A31C8F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_IDENTITY = "iPhone Developer"; + ENABLE_PREVIEWS = YES; + INFOPLIST_FILE = "Derived/InfoPlists/JustChatting-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 17.0.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = fr.outadoc.justchatting; + PRODUCT_NAME = JustChatting; + SDKROOT = iphoneos; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = ( + "$(inherited)", + DEBUG, + ); + SWIFT_COMPILATION_MODE = singlefile; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 6749A1DBE469355572759443 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)"; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 4D569C905677CBE60E5531C0 /* Build configuration list for PBXNativeTarget "JustChatting" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 5D92DFFDCBF361AD66A31C8F /* Debug */, + 42ED6E89084B81FA176D66F2 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 57E138AE30E0610C0BED3A82 /* Build configuration list for PBXProject "JustChatting-Tuist" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 02D14453E061B96CB372EDA7 /* Debug */, + 6749A1DBE469355572759443 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = F256665F95714AA9A9E85DFF /* Project object */; +} diff --git a/app-ios/JustChatting-Tuist.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/app-ios/JustChatting-Tuist.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..919434a62 --- /dev/null +++ b/app-ios/JustChatting-Tuist.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/app-ios/JustChatting-Tuist.xcodeproj/xcshareddata/xcschemes/JustChatting.xcscheme b/app-ios/JustChatting-Tuist.xcodeproj/xcshareddata/xcschemes/JustChatting.xcscheme new file mode 100644 index 000000000..d0bfdcc23 --- /dev/null +++ b/app-ios/JustChatting-Tuist.xcodeproj/xcshareddata/xcschemes/JustChatting.xcscheme @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app-ios/JustChatting-Tuist.xcworkspace/.tuist-generated b/app-ios/JustChatting-Tuist.xcworkspace/.tuist-generated new file mode 100644 index 000000000..e69de29bb diff --git a/app-ios/JustChatting-Tuist.xcworkspace/contents.xcworkspacedata b/app-ios/JustChatting-Tuist.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..f3346febe --- /dev/null +++ b/app-ios/JustChatting-Tuist.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/app-ios/JustChatting-Tuist.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/app-ios/JustChatting-Tuist.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 000000000..08de0be8d --- /dev/null +++ b/app-ios/JustChatting-Tuist.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded + + + diff --git a/app-ios/JustChatting-Tuist.xcworkspace/xcshareddata/xcschemes/JustChatting-Tuist-Workspace.xcscheme b/app-ios/JustChatting-Tuist.xcworkspace/xcshareddata/xcschemes/JustChatting-Tuist-Workspace.xcscheme new file mode 100644 index 000000000..320cf309c --- /dev/null +++ b/app-ios/JustChatting-Tuist.xcworkspace/xcshareddata/xcschemes/JustChatting-Tuist-Workspace.xcscheme @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app-ios/JustChatting.xcodeproj/project.pbxproj b/app-ios/JustChatting.xcodeproj/project.pbxproj index 0e0590f0d..6d22f85b0 100644 --- a/app-ios/JustChatting.xcodeproj/project.pbxproj +++ b/app-ios/JustChatting.xcodeproj/project.pbxproj @@ -3,18 +3,9 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 70; objects = { -/* Begin PBXBuildFile section */ - 058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; }; - 058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; }; - 2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; }; - 432340DF2C98C44500892B22 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 432340DE2C98C44500892B22 /* Launch Screen.storyboard */; }; - 434F6A302C948D1A00D0C381 /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434F6A2F2C948D1A00D0C381 /* MainView.swift */; }; - 43C247E52C986CEA003B167B /* ComposeBridgeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C247E42C986CEA003B167B /* ComposeBridgeView.swift */; }; -/* End PBXBuildFile section */ - /* Begin PBXCopyFilesBuildPhase section */ 7555FFB4242A642300829871 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; @@ -29,16 +20,15 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; - 2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = ""; }; - 432340DE2C98C44500892B22 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = ""; }; - 434F6A2F2C948D1A00D0C381 /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = ""; }; - 43C247E42C986CEA003B167B /* ComposeBridgeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeBridgeView.swift; sourceTree = ""; }; 7555FF7B242A565900829871 /* JustChatting.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JustChatting.app; sourceTree = BUILT_PRODUCTS_DIR; }; 7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ +/* Begin PBXFileSystemSynchronizedRootGroup section */ + 43B894D22CA704CF008378C7 /* Resources */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Resources; sourceTree = ""; }; + 43B894D32CA70695008378C7 /* Sources */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Sources; sourceTree = ""; }; +/* End PBXFileSystemSynchronizedRootGroup section */ + /* Begin PBXFrameworksBuildPhase section */ 7555FF78242A565900829871 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; @@ -50,14 +40,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 058557D7273AAEEB004C7B11 /* Preview Content */ = { - isa = PBXGroup; - children = ( - 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */, - ); - path = "Preview Content"; - sourceTree = ""; - }; 7555FF72242A565900829871 = { isa = PBXGroup; children = ( @@ -79,12 +61,8 @@ isa = PBXGroup; children = ( 7555FF8C242A565B00829871 /* Info.plist */, - 058557BA273AAA24004C7B11 /* Assets.xcassets */, - 058557D7273AAEEB004C7B11 /* Preview Content */, - 2152FB032600AC8F00CF470E /* iOSApp.swift */, - 434F6A2F2C948D1A00D0C381 /* MainView.swift */, - 43C247E42C986CEA003B167B /* ComposeBridgeView.swift */, - 432340DE2C98C44500892B22 /* Launch Screen.storyboard */, + 43B894D22CA704CF008378C7 /* Resources */, + 43B894D32CA70695008378C7 /* Sources */, ); path = JustChatting; sourceTree = ""; @@ -113,6 +91,10 @@ ); dependencies = ( ); + fileSystemSynchronizedGroups = ( + 43B894D22CA704CF008378C7 /* Resources */, + 43B894D32CA70695008378C7 /* Sources */, + ); name = JustChatting; packageProductDependencies = ( ); @@ -161,9 +143,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */, - 432340DF2C98C44500892B22 /* Launch Screen.storyboard in Resources */, - 058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -195,9 +174,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 43C247E52C986CEA003B167B /* ComposeBridgeView.swift in Sources */, - 434F6A302C948D1A00D0C381 /* MainView.swift in Sources */, - 2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/app-ios/JustChatting/Preview Content/Preview Assets.xcassets/Contents.json b/app-ios/JustChatting/Preview Content/Preview Assets.xcassets/Contents.json deleted file mode 100644 index 6156ef4f9..000000000 --- a/app-ios/JustChatting/Preview Content/Preview Assets.xcassets/Contents.json +++ /dev/null @@ -1,4 +0,0 @@ -{"info": { - "author": "xcode", - "version": 1 -}} diff --git a/app-ios/JustChatting/Assets.xcassets/AccentColor.colorset/Contents.json b/app-ios/JustChatting/Resources/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from app-ios/JustChatting/Assets.xcassets/AccentColor.colorset/Contents.json rename to app-ios/JustChatting/Resources/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/app-ios/JustChatting/Assets.xcassets/AppIcon.appiconset/1024 1.png b/app-ios/JustChatting/Resources/Assets.xcassets/AppIcon.appiconset/1024 1.png similarity index 100% rename from app-ios/JustChatting/Assets.xcassets/AppIcon.appiconset/1024 1.png rename to app-ios/JustChatting/Resources/Assets.xcassets/AppIcon.appiconset/1024 1.png diff --git a/app-ios/JustChatting/Assets.xcassets/AppIcon.appiconset/Contents.json b/app-ios/JustChatting/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from app-ios/JustChatting/Assets.xcassets/AppIcon.appiconset/Contents.json rename to app-ios/JustChatting/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/app-ios/JustChatting/Assets.xcassets/AppIcon.appiconset/dark.png b/app-ios/JustChatting/Resources/Assets.xcassets/AppIcon.appiconset/dark.png similarity index 100% rename from app-ios/JustChatting/Assets.xcassets/AppIcon.appiconset/dark.png rename to app-ios/JustChatting/Resources/Assets.xcassets/AppIcon.appiconset/dark.png diff --git a/app-ios/JustChatting/Assets.xcassets/AppIcon.appiconset/icon_monochrome.png b/app-ios/JustChatting/Resources/Assets.xcassets/AppIcon.appiconset/icon_monochrome.png similarity index 100% rename from app-ios/JustChatting/Assets.xcassets/AppIcon.appiconset/icon_monochrome.png rename to app-ios/JustChatting/Resources/Assets.xcassets/AppIcon.appiconset/icon_monochrome.png diff --git a/app-ios/JustChatting/Assets.xcassets/Contents.json b/app-ios/JustChatting/Resources/Assets.xcassets/Contents.json similarity index 100% rename from app-ios/JustChatting/Assets.xcassets/Contents.json rename to app-ios/JustChatting/Resources/Assets.xcassets/Contents.json diff --git a/app-ios/JustChatting/Assets.xcassets/LogoForeground.imageset/Contents.json b/app-ios/JustChatting/Resources/Assets.xcassets/LogoForeground.imageset/Contents.json similarity index 100% rename from app-ios/JustChatting/Assets.xcassets/LogoForeground.imageset/Contents.json rename to app-ios/JustChatting/Resources/Assets.xcassets/LogoForeground.imageset/Contents.json diff --git a/app-ios/JustChatting/Assets.xcassets/LogoForeground.imageset/LogoForeground.png b/app-ios/JustChatting/Resources/Assets.xcassets/LogoForeground.imageset/LogoForeground.png similarity index 100% rename from app-ios/JustChatting/Assets.xcassets/LogoForeground.imageset/LogoForeground.png rename to app-ios/JustChatting/Resources/Assets.xcassets/LogoForeground.imageset/LogoForeground.png diff --git a/app-ios/JustChatting/Assets.xcassets/LogoForeground.imageset/LogoForeground@2x.png b/app-ios/JustChatting/Resources/Assets.xcassets/LogoForeground.imageset/LogoForeground@2x.png similarity index 100% rename from app-ios/JustChatting/Assets.xcassets/LogoForeground.imageset/LogoForeground@2x.png rename to app-ios/JustChatting/Resources/Assets.xcassets/LogoForeground.imageset/LogoForeground@2x.png diff --git a/app-ios/JustChatting/Assets.xcassets/LogoForeground.imageset/LogoForeground@3x.png b/app-ios/JustChatting/Resources/Assets.xcassets/LogoForeground.imageset/LogoForeground@3x.png similarity index 100% rename from app-ios/JustChatting/Assets.xcassets/LogoForeground.imageset/LogoForeground@3x.png rename to app-ios/JustChatting/Resources/Assets.xcassets/LogoForeground.imageset/LogoForeground@3x.png diff --git a/app-ios/JustChatting/Launch Screen.storyboard b/app-ios/JustChatting/Resources/Launch Screen.storyboard similarity index 100% rename from app-ios/JustChatting/Launch Screen.storyboard rename to app-ios/JustChatting/Resources/Launch Screen.storyboard diff --git a/app-ios/JustChatting/ComposeBridgeView.swift b/app-ios/JustChatting/Sources/ComposeBridgeView.swift similarity index 100% rename from app-ios/JustChatting/ComposeBridgeView.swift rename to app-ios/JustChatting/Sources/ComposeBridgeView.swift diff --git a/app-ios/JustChatting/MainView.swift b/app-ios/JustChatting/Sources/MainView.swift similarity index 100% rename from app-ios/JustChatting/MainView.swift rename to app-ios/JustChatting/Sources/MainView.swift diff --git a/app-ios/JustChatting/iOSApp.swift b/app-ios/JustChatting/Sources/iOSApp.swift similarity index 100% rename from app-ios/JustChatting/iOSApp.swift rename to app-ios/JustChatting/Sources/iOSApp.swift diff --git a/app-ios/Project.swift b/app-ios/Project.swift new file mode 100644 index 000000000..3830c8ad4 --- /dev/null +++ b/app-ios/Project.swift @@ -0,0 +1,48 @@ +import ProjectDescription + +import ProjectDescription + +let project = Project( + name: "JustChatting-Tuist", + settings: .settings(base: [ + "FRAMEWORK_SEARCH_PATHS": "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", + ]), + targets: [ + .target( + name: "JustChatting", + destinations: .iOS, + product: .app, + bundleId: "fr.outadoc.justchatting", + deploymentTargets: .iOS("17.0.0"), + infoPlist: .extendingDefault( + with: [ + "CFBundleShortVersionString": "0.1.0", + "CFBundleVersion": "0.1.0", + "CFBundleLocalizations": ["en", "fr"], + "CFBundleURLTypes": [ + Plist.Value.dictionary( + [ + "CFBundleTypeRole": "Editor", + "CFBundleURLName": "fr.outadoc.justchatting", + "CFBundleURLSchemes": ["justchatting"], + ] + ), + ], + "UILaunchStoryboardName": "Launch Screen.storyboard", + "CADisableMinimumFrameDurationOnPhone": true, + "LSApplicationCategoryType": "public.app-category.social-networking", + ] + ), + sources: ["JustChatting/Sources/**"], + resources: .resources(["JustChatting/Resources/**"]), + scripts: [ + .pre( + script: "cd \"$SRCROOT/..\" && ./gradlew :shared:embedAndSignAppleFrameworkForXcode", + name: "Generate shared framework", + basedOnDependencyAnalysis: false + ), + ], + dependencies: [] + ), + ] +) diff --git a/app-ios/Tuist/Config.swift b/app-ios/Tuist/Config.swift new file mode 100644 index 000000000..ff8e64fa9 --- /dev/null +++ b/app-ios/Tuist/Config.swift @@ -0,0 +1,3 @@ +import ProjectDescription + +let config = Config() diff --git a/app-ios/Tuist/Package.swift b/app-ios/Tuist/Package.swift new file mode 100644 index 000000000..805c015e5 --- /dev/null +++ b/app-ios/Tuist/Package.swift @@ -0,0 +1,22 @@ +// swift-tools-version: 5.9 +import PackageDescription + +#if TUIST + import ProjectDescription + + let packageSettings = PackageSettings( + // Customize the product types for specific package product + // Default is .staticFramework + // productTypes: ["Alamofire": .framework,] + productTypes: [:] + ) +#endif + +let package = Package( + name: "JustChatting", + dependencies: [ + // Add your own dependencies here: + // .package(url: "https://github.com/Alamofire/Alamofire", from: "5.0.0"), + // You can read more about dependencies here: https://docs.tuist.io/documentation/tuist/dependencies + ] +) diff --git a/shared/src/commonMain/kotlin/fr/outadoc/justchatting/feature/preferences/domain/AuthRepository.kt b/shared/src/commonMain/kotlin/fr/outadoc/justchatting/feature/preferences/domain/AuthRepository.kt index d4b928efa..5a1d4d509 100644 --- a/shared/src/commonMain/kotlin/fr/outadoc/justchatting/feature/preferences/domain/AuthRepository.kt +++ b/shared/src/commonMain/kotlin/fr/outadoc/justchatting/feature/preferences/domain/AuthRepository.kt @@ -34,7 +34,8 @@ internal class AuthRepository( when (token) { null -> AppUser.NotLoggedIn else -> { - authApi.validateToken(token) + authApi + .validateToken(token) .mapCatching { response -> if (response.clientId != oAuthAppCredentials.clientId) { throw InvalidClientIdException("Invalid client ID: ${response.clientId}") From 14ff08073605681c940516996e5f23a55d0adacd Mon Sep 17 00:00:00 2001 From: Baptiste Candellier Date: Fri, 27 Sep 2024 18:30:11 +0200 Subject: [PATCH 2/9] Ignore xcode files --- app-ios/.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app-ios/.gitignore b/app-ios/.gitignore index f043e232f..f7f6d81cc 100644 --- a/app-ios/.gitignore +++ b/app-ios/.gitignore @@ -92,3 +92,5 @@ iOSInjectionProject/ # Tuist Derived/ +*.xcodeproj +*.xcworkspace From 297e5f2320925a953de8f1deecd996878e0dbe39 Mon Sep 17 00:00:00 2001 From: Baptiste Candellier Date: Fri, 27 Sep 2024 18:35:05 +0200 Subject: [PATCH 3/9] Remove generated project --- .../project.pbxproj | 426 ------------------ .../contents.xcworkspacedata | 7 - .../xcschemes/JustChatting.xcscheme | 79 ---- .../.tuist-generated | 0 .../contents.xcworkspacedata | 7 - .../xcshareddata/WorkspaceSettings.xcsettings | 8 - .../JustChatting-Tuist-Workspace.xcscheme | 78 ---- 7 files changed, 605 deletions(-) delete mode 100644 app-ios/JustChatting-Tuist.xcodeproj/project.pbxproj delete mode 100644 app-ios/JustChatting-Tuist.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 app-ios/JustChatting-Tuist.xcodeproj/xcshareddata/xcschemes/JustChatting.xcscheme delete mode 100644 app-ios/JustChatting-Tuist.xcworkspace/.tuist-generated delete mode 100644 app-ios/JustChatting-Tuist.xcworkspace/contents.xcworkspacedata delete mode 100644 app-ios/JustChatting-Tuist.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings delete mode 100644 app-ios/JustChatting-Tuist.xcworkspace/xcshareddata/xcschemes/JustChatting-Tuist-Workspace.xcscheme diff --git a/app-ios/JustChatting-Tuist.xcodeproj/project.pbxproj b/app-ios/JustChatting-Tuist.xcodeproj/project.pbxproj deleted file mode 100644 index 94fa14123..000000000 --- a/app-ios/JustChatting-Tuist.xcodeproj/project.pbxproj +++ /dev/null @@ -1,426 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 55; - objects = { - -/* Begin PBXBuildFile section */ - 03FC03514554721DDC88484C /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B66540879C6527242006291 /* MainView.swift */; }; - 11AF76F34A88B134DAA64C94 /* ComposeBridgeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE815B0A8230EF305658C175 /* ComposeBridgeView.swift */; }; - 1C6E705F5CE0D0F74B61DF0E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E054997681B0105A5D65870 /* iOSApp.swift */; }; - 585B1E677280E0A519AF6085 /* TuistBundle+JustChatting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E6750D16DB3952AD30CBFE8 /* TuistBundle+JustChatting.swift */; }; - 7C4CF400872E7BF8ADB0D661 /* TuistAssets+JustChatting.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64C9D2F9EFE6A6EA4314F9F /* TuistAssets+JustChatting.swift */; }; - 99878FB0B2186BB5E72BFDE9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B5E2DB0FA8B2C929CD373672 /* Assets.xcassets */; }; - CD74898B5D21637ACC7A30A1 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8273C0057B157A249451F2A7 /* Launch Screen.storyboard */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - FC68A0561E3F539E18ACBB58 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 3E054997681B0105A5D65870 /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = ""; }; - 4B66540879C6527242006291 /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = ""; }; - 7E3777AF1723961884EBA3E5 /* JustChatting.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JustChatting.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 7E6750D16DB3952AD30CBFE8 /* TuistBundle+JustChatting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TuistBundle+JustChatting.swift"; sourceTree = ""; }; - 8273C0057B157A249451F2A7 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = ""; }; - B5E2DB0FA8B2C929CD373672 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - CC8C6F11D506DCA6E335F13F /* JustChatting-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "JustChatting-Info.plist"; sourceTree = ""; }; - D64C9D2F9EFE6A6EA4314F9F /* TuistAssets+JustChatting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TuistAssets+JustChatting.swift"; sourceTree = ""; }; - EE815B0A8230EF305658C175 /* ComposeBridgeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeBridgeView.swift; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - F8408B9B4AE723860AFD521A /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 06D158E545E126D757137EBB /* Products */ = { - isa = PBXGroup; - children = ( - 7E3777AF1723961884EBA3E5 /* JustChatting.app */, - ); - name = Products; - sourceTree = ""; - }; - 3E4E77487A8C06D8CE57592B /* Sources */ = { - isa = PBXGroup; - children = ( - EE815B0A8230EF305658C175 /* ComposeBridgeView.swift */, - 3E054997681B0105A5D65870 /* iOSApp.swift */, - 4B66540879C6527242006291 /* MainView.swift */, - ); - path = Sources; - sourceTree = ""; - }; - 648195497F5DD836E2110346 /* Sources */ = { - isa = PBXGroup; - children = ( - D64C9D2F9EFE6A6EA4314F9F /* TuistAssets+JustChatting.swift */, - 7E6750D16DB3952AD30CBFE8 /* TuistBundle+JustChatting.swift */, - ); - path = Sources; - sourceTree = ""; - }; - 65E55140816B753D418EADDE /* Resources */ = { - isa = PBXGroup; - children = ( - B5E2DB0FA8B2C929CD373672 /* Assets.xcassets */, - 8273C0057B157A249451F2A7 /* Launch Screen.storyboard */, - ); - path = Resources; - sourceTree = ""; - }; - 7FEF3BBC1B5228614976654F /* Derived */ = { - isa = PBXGroup; - children = ( - CB9460D3AAFA50D5ED7F8ADA /* InfoPlists */, - 648195497F5DD836E2110346 /* Sources */, - ); - path = Derived; - sourceTree = ""; - }; - A8BDEC9498B7445615DBD899 /* JustChatting */ = { - isa = PBXGroup; - children = ( - 65E55140816B753D418EADDE /* Resources */, - 3E4E77487A8C06D8CE57592B /* Sources */, - ); - path = JustChatting; - sourceTree = ""; - }; - C62598EF3D3196902491645E = { - isa = PBXGroup; - children = ( - EC00916EF8EE19E7B8DBA6B9 /* Project */, - 06D158E545E126D757137EBB /* Products */, - ); - sourceTree = ""; - }; - CB9460D3AAFA50D5ED7F8ADA /* InfoPlists */ = { - isa = PBXGroup; - children = ( - CC8C6F11D506DCA6E335F13F /* JustChatting-Info.plist */, - ); - path = InfoPlists; - sourceTree = ""; - }; - EC00916EF8EE19E7B8DBA6B9 /* Project */ = { - isa = PBXGroup; - children = ( - 7FEF3BBC1B5228614976654F /* Derived */, - A8BDEC9498B7445615DBD899 /* JustChatting */, - ); - name = Project; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - FD67AF8A31CB9E24A8AD388C /* JustChatting */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4D569C905677CBE60E5531C0 /* Build configuration list for PBXNativeTarget "JustChatting" */; - buildPhases = ( - 0375C38FBACEA1C5105586E5 /* Generate shared framework */, - C0CAC03143B039B1238DA47F /* Sources */, - 8CF34ED1DBE273A26D23D1E9 /* Resources */, - FC68A0561E3F539E18ACBB58 /* Embed Frameworks */, - F8408B9B4AE723860AFD521A /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = JustChatting; - productName = JustChatting; - productReference = 7E3777AF1723961884EBA3E5 /* JustChatting.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - F256665F95714AA9A9E85DFF /* Project object */ = { - isa = PBXProject; - attributes = { - BuildIndependentTargetsInParallel = YES; - TargetAttributes = { - }; - }; - buildConfigurationList = 57E138AE30E0610C0BED3A82 /* Build configuration list for PBXProject "JustChatting-Tuist" */; - compatibilityVersion = "Xcode 14.0"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - Base, - en, - ); - mainGroup = C62598EF3D3196902491645E; - productRefGroup = 06D158E545E126D757137EBB /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - FD67AF8A31CB9E24A8AD388C /* JustChatting */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 8CF34ED1DBE273A26D23D1E9 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 99878FB0B2186BB5E72BFDE9 /* Assets.xcassets in Resources */, - CD74898B5D21637ACC7A30A1 /* Launch Screen.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 0375C38FBACEA1C5105586E5 /* Generate shared framework */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Generate shared framework"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cd \"$SRCROOT/..\" && ./gradlew :shared:embedAndSignAppleFrameworkForXcode"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - C0CAC03143B039B1238DA47F /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 7C4CF400872E7BF8ADB0D661 /* TuistAssets+JustChatting.swift in Sources */, - 585B1E677280E0A519AF6085 /* TuistBundle+JustChatting.swift in Sources */, - 11AF76F34A88B134DAA64C94 /* ComposeBridgeView.swift in Sources */, - 03FC03514554721DDC88484C /* MainView.swift in Sources */, - 1C6E705F5CE0D0F74B61DF0E /* iOSApp.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 02D14453E061B96CB372EDA7 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEAD_CODE_STRIPPING = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)"; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 42ED6E89084B81FA176D66F2 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "iPhone Developer"; - ENABLE_PREVIEWS = YES; - INFOPLIST_FILE = "Derived/InfoPlists/JustChatting-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 17.0.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = fr.outadoc.justchatting; - PRODUCT_NAME = JustChatting; - SDKROOT = iphoneos; - SUPPORTS_MACCATALYST = NO; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; - SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - 5D92DFFDCBF361AD66A31C8F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "iPhone Developer"; - ENABLE_PREVIEWS = YES; - INFOPLIST_FILE = "Derived/InfoPlists/JustChatting-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 17.0.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = fr.outadoc.justchatting; - PRODUCT_NAME = JustChatting; - SDKROOT = iphoneos; - SUPPORTS_MACCATALYST = NO; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; - SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = ( - "$(inherited)", - DEBUG, - ); - SWIFT_COMPILATION_MODE = singlefile; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 6749A1DBE469355572759443 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEAD_CODE_STRIPPING = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)"; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 4D569C905677CBE60E5531C0 /* Build configuration list for PBXNativeTarget "JustChatting" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 5D92DFFDCBF361AD66A31C8F /* Debug */, - 42ED6E89084B81FA176D66F2 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 57E138AE30E0610C0BED3A82 /* Build configuration list for PBXProject "JustChatting-Tuist" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 02D14453E061B96CB372EDA7 /* Debug */, - 6749A1DBE469355572759443 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = F256665F95714AA9A9E85DFF /* Project object */; -} diff --git a/app-ios/JustChatting-Tuist.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/app-ios/JustChatting-Tuist.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a62..000000000 --- a/app-ios/JustChatting-Tuist.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/app-ios/JustChatting-Tuist.xcodeproj/xcshareddata/xcschemes/JustChatting.xcscheme b/app-ios/JustChatting-Tuist.xcodeproj/xcshareddata/xcschemes/JustChatting.xcscheme deleted file mode 100644 index d0bfdcc23..000000000 --- a/app-ios/JustChatting-Tuist.xcodeproj/xcshareddata/xcschemes/JustChatting.xcscheme +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app-ios/JustChatting-Tuist.xcworkspace/.tuist-generated b/app-ios/JustChatting-Tuist.xcworkspace/.tuist-generated deleted file mode 100644 index e69de29bb..000000000 diff --git a/app-ios/JustChatting-Tuist.xcworkspace/contents.xcworkspacedata b/app-ios/JustChatting-Tuist.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index f3346febe..000000000 --- a/app-ios/JustChatting-Tuist.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/app-ios/JustChatting-Tuist.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/app-ios/JustChatting-Tuist.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index 08de0be8d..000000000 --- a/app-ios/JustChatting-Tuist.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded - - - diff --git a/app-ios/JustChatting-Tuist.xcworkspace/xcshareddata/xcschemes/JustChatting-Tuist-Workspace.xcscheme b/app-ios/JustChatting-Tuist.xcworkspace/xcshareddata/xcschemes/JustChatting-Tuist-Workspace.xcscheme deleted file mode 100644 index 320cf309c..000000000 --- a/app-ios/JustChatting-Tuist.xcworkspace/xcshareddata/xcschemes/JustChatting-Tuist-Workspace.xcscheme +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 82375a04e1b8ee52e2414425d89c295f3b98b5f5 Mon Sep 17 00:00:00 2001 From: Baptiste Candellier Date: Fri, 27 Sep 2024 18:50:37 +0200 Subject: [PATCH 4/9] Remove comments --- app-ios/Tuist/Package.swift | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/app-ios/Tuist/Package.swift b/app-ios/Tuist/Package.swift index 805c015e5..d18454ec4 100644 --- a/app-ios/Tuist/Package.swift +++ b/app-ios/Tuist/Package.swift @@ -5,18 +5,11 @@ import PackageDescription import ProjectDescription let packageSettings = PackageSettings( - // Customize the product types for specific package product - // Default is .staticFramework - // productTypes: ["Alamofire": .framework,] productTypes: [:] ) #endif let package = Package( name: "JustChatting", - dependencies: [ - // Add your own dependencies here: - // .package(url: "https://github.com/Alamofire/Alamofire", from: "5.0.0"), - // You can read more about dependencies here: https://docs.tuist.io/documentation/tuist/dependencies - ] + dependencies: [] ) From 5cacf07fd7c9fb1b8aede4045b6a955c0cc73a5c Mon Sep 17 00:00:00 2001 From: Baptiste Candellier Date: Fri, 27 Sep 2024 19:06:51 +0200 Subject: [PATCH 5/9] Add readme --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 026f27d9c..1c2d099fe 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,16 @@ # Just Chatting An app focused on a great Twitch chat experience. + +## Project setup + +### Android + +1. Install [Android Studio](https://developer.android.com/studio/install); +2. Open the project in the IDE. + +### iOS + +1. Install Xcode 16; +2. Install [Tuist](https://docs.tuist.io/guides/quick-start/install-tuist); +2. Move to the `app-ios` directory, and run `tuist generate` to generate and open the Xcode project. From a026fd9dcd48bf50ae33a93474740e208bcf1b76 Mon Sep 17 00:00:00 2001 From: Baptiste Candellier Date: Fri, 27 Sep 2024 19:07:43 +0200 Subject: [PATCH 6/9] Remove original xc project --- .../JustChatting.xcodeproj/project.pbxproj | 387 ------------------ .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/swiftpm/Package.resolved | 14 - .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - 6 files changed, 431 deletions(-) delete mode 100644 app-ios/JustChatting.xcodeproj/project.pbxproj delete mode 100644 app-ios/JustChatting.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 app-ios/JustChatting.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 app-ios/JustChatting.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved delete mode 100644 app-ios/JustChatting.xcworkspace/contents.xcworkspacedata delete mode 100644 app-ios/JustChatting.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/app-ios/JustChatting.xcodeproj/project.pbxproj b/app-ios/JustChatting.xcodeproj/project.pbxproj deleted file mode 100644 index 6d22f85b0..000000000 --- a/app-ios/JustChatting.xcodeproj/project.pbxproj +++ /dev/null @@ -1,387 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 70; - objects = { - -/* Begin PBXCopyFilesBuildPhase section */ - 7555FFB4242A642300829871 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 7555FF7B242A565900829871 /* JustChatting.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JustChatting.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFileSystemSynchronizedRootGroup section */ - 43B894D22CA704CF008378C7 /* Resources */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Resources; sourceTree = ""; }; - 43B894D32CA70695008378C7 /* Sources */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Sources; sourceTree = ""; }; -/* End PBXFileSystemSynchronizedRootGroup section */ - -/* Begin PBXFrameworksBuildPhase section */ - 7555FF78242A565900829871 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 7555FF72242A565900829871 = { - isa = PBXGroup; - children = ( - 7555FF7D242A565900829871 /* JustChatting */, - 7555FF7C242A565900829871 /* Products */, - 7555FFB0242A642200829871 /* Frameworks */, - ); - sourceTree = ""; - }; - 7555FF7C242A565900829871 /* Products */ = { - isa = PBXGroup; - children = ( - 7555FF7B242A565900829871 /* JustChatting.app */, - ); - name = Products; - sourceTree = ""; - }; - 7555FF7D242A565900829871 /* JustChatting */ = { - isa = PBXGroup; - children = ( - 7555FF8C242A565B00829871 /* Info.plist */, - 43B894D22CA704CF008378C7 /* Resources */, - 43B894D32CA70695008378C7 /* Sources */, - ); - path = JustChatting; - sourceTree = ""; - }; - 7555FFB0242A642200829871 /* Frameworks */ = { - isa = PBXGroup; - children = ( - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 7555FF7A242A565900829871 /* JustChatting */ = { - isa = PBXNativeTarget; - buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "JustChatting" */; - buildPhases = ( - 7555FFB5242A651A00829871 /* ShellScript */, - 7555FF77242A565900829871 /* Sources */, - 7555FF78242A565900829871 /* Frameworks */, - 7555FF79242A565900829871 /* Resources */, - 7555FFB4242A642300829871 /* Embed Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - fileSystemSynchronizedGroups = ( - 43B894D22CA704CF008378C7 /* Resources */, - 43B894D32CA70695008378C7 /* Sources */, - ); - name = JustChatting; - packageProductDependencies = ( - ); - productName = JustChatting; - productReference = 7555FF7B242A565900829871 /* JustChatting.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 7555FF73242A565900829871 /* Project object */ = { - isa = PBXProject; - attributes = { - BuildIndependentTargetsInParallel = YES; - LastSwiftUpdateCheck = 1130; - LastUpgradeCheck = 1430; - ORGANIZATIONNAME = "Baptiste Candellier"; - TargetAttributes = { - 7555FF7A242A565900829871 = { - CreatedOnToolsVersion = 11.3.1; - }; - }; - }; - buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "JustChatting" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 7555FF72242A565900829871; - packageReferences = ( - ); - productRefGroup = 7555FF7C242A565900829871 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 7555FF7A242A565900829871 /* JustChatting */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 7555FF79242A565900829871 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 7555FFB5242A651A00829871 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - 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 = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 7555FFA3242A565B00829871 /* 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_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 18.0; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - }; - name = Debug; - }; - 7555FFA4242A565B00829871 /* 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_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 18.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - SDKROOT = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 7555FFA6242A565B00829871 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_ASSET_PATHS = "\"JustChatting/Preview Content\""; - DEVELOPMENT_TEAM = C38RDC5QNT; - ENABLE_PREVIEWS = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", - ); - INFOPLIST_FILE = JustChatting/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = "Just Chatting"; - INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking"; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-framework", - JCShared, - ); - PRODUCT_BUNDLE_IDENTIFIER = fr.outadoc.justchatting; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 6.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 7555FFA7242A565B00829871 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_ASSET_PATHS = "\"JustChatting/Preview Content\""; - DEVELOPMENT_TEAM = C38RDC5QNT; - ENABLE_PREVIEWS = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", - ); - INFOPLIST_FILE = JustChatting/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = "Just Chatting"; - INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking"; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-framework", - JCShared, - ); - PRODUCT_BUNDLE_IDENTIFIER = fr.outadoc.justchatting; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 6.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 7555FF76242A565900829871 /* Build configuration list for PBXProject "JustChatting" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 7555FFA3242A565B00829871 /* Debug */, - 7555FFA4242A565B00829871 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "JustChatting" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 7555FFA6242A565B00829871 /* Debug */, - 7555FFA7242A565B00829871 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 7555FF73242A565900829871 /* Project object */; -} diff --git a/app-ios/JustChatting.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/app-ios/JustChatting.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a62..000000000 --- a/app-ios/JustChatting.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/app-ios/JustChatting.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/app-ios/JustChatting.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/app-ios/JustChatting.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/app-ios/JustChatting.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/app-ios/JustChatting.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index a0ab5413e..000000000 --- a/app-ios/JustChatting.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "swinject", - "kind" : "remoteSourceControl", - "location" : "git@github.com:Swinject/Swinject.git", - "state" : { - "revision" : "463cb2d659c8ae34899d18057ea5b1bb86fc3178", - "version" : "2.8.4" - } - } - ], - "version" : 2 -} diff --git a/app-ios/JustChatting.xcworkspace/contents.xcworkspacedata b/app-ios/JustChatting.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index afed28400..000000000 --- a/app-ios/JustChatting.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/app-ios/JustChatting.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/app-ios/JustChatting.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/app-ios/JustChatting.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - From 65bd7163f3839deff465199718ad122ed9bf58d0 Mon Sep 17 00:00:00 2001 From: Baptiste Candellier Date: Fri, 27 Sep 2024 19:08:06 +0200 Subject: [PATCH 7/9] Rename new project --- app-ios/Project.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-ios/Project.swift b/app-ios/Project.swift index 3830c8ad4..4dcf9795d 100644 --- a/app-ios/Project.swift +++ b/app-ios/Project.swift @@ -3,7 +3,7 @@ import ProjectDescription import ProjectDescription let project = Project( - name: "JustChatting-Tuist", + name: "JustChatting", settings: .settings(base: [ "FRAMEWORK_SEARCH_PATHS": "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", ]), From 0646d17b3abcf4fd5aed7b7ec87034a2916480ad Mon Sep 17 00:00:00 2001 From: Baptiste Candellier Date: Fri, 27 Sep 2024 19:34:26 +0200 Subject: [PATCH 8/9] Set more build settings --- .gitignore | 2 +- app-ios/.DS_Store | Bin 6148 -> 0 bytes app-ios/Project.swift | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-) delete mode 100644 app-ios/.DS_Store diff --git a/.gitignore b/.gitignore index 020cb6d69..d9981d39b 100644 --- a/.gitignore +++ b/.gitignore @@ -60,6 +60,6 @@ fastlane/screenshots fastlane/test_output fastlane/readme.md -*.DS_Store +**/.DS_Store .kotlin/ diff --git a/app-ios/.DS_Store b/app-ios/.DS_Store deleted file mode 100644 index 85e6d9f794becbc0c092c604316be048aaf3411c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK!AiqG5Pe%KRP@l3cnp4k&_9SZUW&KeMcb5CX`4{3cntU#-uwfcvl?G@Qe|1WEi8slB@gKq?eBJd7+z5 z1sdhg^CTJ0@*(p&9rB{hAJX)rDB!Bg>S`-l~#O0^+JCn3t}9wRHTPue*`=YW{iO! GW#AheM@?)1 diff --git a/app-ios/Project.swift b/app-ios/Project.swift index 4dcf9795d..404fbebd8 100644 --- a/app-ios/Project.swift +++ b/app-ios/Project.swift @@ -5,7 +5,10 @@ import ProjectDescription let project = Project( name: "JustChatting", settings: .settings(base: [ + "ENABLE_USER_SCRIPT_SANDBOXING": "NO", + "ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS": "NO", "FRAMEWORK_SEARCH_PATHS": "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", + "SWIFT_VERSION": "6.0" ]), targets: [ .target( From 065c8ef2175fcf547daaf3dc98f87ea5e58d513b Mon Sep 17 00:00:00 2001 From: Baptiste Candellier Date: Fri, 27 Sep 2024 19:38:52 +0200 Subject: [PATCH 9/9] Give more memory to gradle --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0fb98979f..3844bd796 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ android.enableR8.fullMode=false org.gradle.configureondemand=true org.gradle.daemon=true -org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8 -XX:+UseParallelGC +org.gradle.jvmargs=-Xmx6g -Dfile.encoding=UTF-8 -XX:+UseParallelGC org.gradle.parallel=true org.gradle.configuration-cache=false