diff --git a/.circleci/config.yml b/.circleci/config.yml index 1ccef44b..0d190766 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,12 +16,18 @@ jobs: shell: /bin/bash --login -o pipefail steps: - checkout - - run: gem install bundler:1.17.2 - - run: bundle update --bundler - - run: bundle install + - restore_cache: + key: spm-cache-{{ checksum "litewallet.xcodeproj/project.xcworkspace/ xcshareddata/swiftpm/Package.resolved" }} + - run: + name: Install Bundler + command: gem install bundler:1.17.2; bundle update --bundler; bundle install - run: name: Fastlane command: bundle exec fastlane $FASTLANE_LANE + - save_cache: + paths: + - SourcePackages/ + key: spm-cache-{{ checksum "litewallet.xcodeproj/project.xcworkspace/ xcshareddata/swiftpm/Package.resolved" }} - store_artifacts: path: output - store_test_results: diff --git a/.gitignore b/.gitignore index 24ca1f81..2d0631f7 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,7 @@ Package.resolved # Add this line if you want to avoid checking in Xcode SPM integration. .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata - + SourcePackages/* # SwiftFormat BuildTools/.build diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 22f5f935..badb11c1 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -8,16 +8,21 @@ platform :ios do desc "Run all the unit tests" lane :all_unit_tests do - scan( - scheme: "litewallet", - devices: ["iPhone 14","iPhone 15"], - clean: true - ) + run_tests(scheme: "litewallet") + # run_tests( + # scheme: "litewallet", + # devices: "iPhone 14", + # cloned_source_packages_path: "SourcePackages", + # clean: true, + # build_for_testing: true + # ) end - desc "Ad-hoc build" - lane :adhoc do - match(type: "adhoc") - gym(export_method: "ad-hoc") + desc "Build and Archive" + lane :build_and_archive do + build_app( + scheme: "litewallet", + cloned_source_packages_path: "SourcePackages" + ) end end \ No newline at end of file diff --git a/fastlane/README.md b/fastlane/README.md index ea00328d..d3cc0340 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -15,21 +15,21 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do ## iOS -### ios test +### ios all_unit_tests ```sh -[bundle exec] fastlane ios test +[bundle exec] fastlane ios all_unit_tests ``` -Run all the tests +Run all the unit tests -### ios adhoc +### ios build_and_archive ```sh -[bundle exec] fastlane ios adhoc +[bundle exec] fastlane ios build_and_archive ``` -Ad-hoc build +Build and Archive ---- diff --git a/litewallet.xcodeproj/project.pbxproj b/litewallet.xcodeproj/project.pbxproj index ddcec8b2..71b5b15a 100644 --- a/litewallet.xcodeproj/project.pbxproj +++ b/litewallet.xcodeproj/project.pbxproj @@ -274,7 +274,6 @@ C350788C27DCB10700A50819 /* TextView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C350788B27DCB10700A50819 /* TextView+Extension.swift */; }; C353582B2D11D9B500395C45 /* RemoteConfigHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C353582A2D11D9B500395C45 /* RemoteConfigHelper.swift */; }; C353582D2D11DA4900395C45 /* FirebaseRemoteConfig in Frameworks */ = {isa = PBXBuildFile; productRef = C353582C2D11DA4900395C45 /* FirebaseRemoteConfig */; }; - C353582F2D11DA4900395C45 /* FirebaseRemoteConfigSwift in Frameworks */ = {isa = PBXBuildFile; productRef = C353582E2D11DA4900395C45 /* FirebaseRemoteConfigSwift */; }; C35358332D11E7D100395C45 /* APITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C35358322D11E7D100395C45 /* APITests.swift */; }; C35358372D11EB0600395C45 /* remote-config-defaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = C35358362D11EB0600395C45 /* remote-config-defaults.plist */; settings = {ASSET_TAGS = ("initial-resources", ); }; }; C35358392D11EB2F00395C45 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C35358382D11EB2F00395C45 /* GoogleService-Info.plist */; settings = {ASSET_TAGS = ("initial-resources", ); }; }; @@ -1677,7 +1676,6 @@ C3423C182B781C6B0051BD6D /* PushNotifications in Frameworks */, C35C1222293D464A0009022D /* FirebaseAuth in Frameworks */, C35C1224293D464A0009022D /* FirebaseCrashlytics in Frameworks */, - C353582F2D11DA4900395C45 /* FirebaseRemoteConfigSwift in Frameworks */, C35C1220293D464A0009022D /* FirebaseAnalytics in Frameworks */, 759DA0BE1DAC36A3008CC49B /* libBRCore.a in Frameworks */, ); @@ -3600,7 +3598,6 @@ C3423C172B781C6B0051BD6D /* PushNotifications */, C30808A42D0A23530063E793 /* AppsFlyerLib-Static */, C353582C2D11DA4900395C45 /* FirebaseRemoteConfig */, - C353582E2D11DA4900395C45 /* FirebaseRemoteConfigSwift */, ); productName = breadwallet; productReference = 75A2A7901DA5934300A983D8 /* Litewallet.app */; @@ -4512,7 +4509,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; ON_DEMAND_RESOURCES_INITIAL_INSTALL_TAGS = "initial-resources"; @@ -4871,7 +4868,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; MTL_ENABLE_DEBUG_INFO = NO; ON_DEMAND_RESOURCES_INITIAL_INSTALL_TAGS = "initial-resources"; "OTHER_LDFLAGS[arch=*]" = "-ObjC "; @@ -5018,7 +5015,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; ON_DEMAND_RESOURCES_INITIAL_INSTALL_TAGS = "initial-resources"; @@ -5164,7 +5161,7 @@ 2465874023A5AAD100A32E9E /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; + defaultConfigurationName = Debug; }; 755CD9CA1DAA18420075898E /* Build configuration list for PBXNativeTarget "unbound" */ = { isa = XCConfigurationList; @@ -5174,7 +5171,7 @@ 755CD9CC1DAA18420075898E /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; + defaultConfigurationName = Debug; }; 755CD9D71DAA197D0075898E /* Build configuration list for PBXNativeTarget "BRCore" */ = { isa = XCConfigurationList; @@ -5184,7 +5181,7 @@ 755CD9D91DAA197D0075898E /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; + defaultConfigurationName = Debug; }; 759DA0DA1DAC8668008CC49B /* Build configuration list for PBXLegacyTarget "submodules" */ = { isa = XCConfigurationList; @@ -5194,7 +5191,7 @@ 759DA0D91DAC8668008CC49B /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; + defaultConfigurationName = Debug; }; 75A2A78B1DA5934300A983D8 /* Build configuration list for PBXProject "litewallet" */ = { isa = XCConfigurationList; @@ -5204,7 +5201,7 @@ 75A2A7DA1DA5934400A983D8 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; + defaultConfigurationName = Debug; }; 75A2A7E31DA5934400A983D8 /* Build configuration list for PBXNativeTarget "litewallet" */ = { isa = XCConfigurationList; @@ -5214,7 +5211,7 @@ 75A2A7E51DA5934400A983D8 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; + defaultConfigurationName = Debug; }; 75A2A8151DA5936F00A983D8 /* Build configuration list for PBXNativeTarget "TodayExtension" */ = { isa = XCConfigurationList; @@ -5224,7 +5221,7 @@ 75A2A8171DA5936F00A983D8 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; + defaultConfigurationName = Debug; }; 75C735B51DAA1C9F00251ECF /* Build configuration list for PBXNativeTarget "nettle" */ = { isa = XCConfigurationList; @@ -5234,7 +5231,7 @@ 75C735B71DAA1C9F00251ECF /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; + defaultConfigurationName = Debug; }; /* End XCConfigurationList section */ @@ -5260,7 +5257,7 @@ repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git"; requirement = { kind = exactVersion; - version = 10.23.0; + version = 11.6.0; }; }; C35C1228293D48330009022D /* XCRemoteSwiftPackageReference "KeychainAccess" */ = { @@ -5289,11 +5286,6 @@ package = C35C121E293D464A0009022D /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; productName = FirebaseRemoteConfig; }; - C353582E2D11DA4900395C45 /* FirebaseRemoteConfigSwift */ = { - isa = XCSwiftPackageProductDependency; - package = C35C121E293D464A0009022D /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; - productName = FirebaseRemoteConfigSwift; - }; C35C121F293D464A0009022D /* FirebaseAnalytics */ = { isa = XCSwiftPackageProductDependency; package = C35C121E293D464A0009022D /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;