diff --git a/Examples/MagicWeather/MagicWeather.xcodeproj/project.pbxproj b/Examples/MagicWeather/MagicWeather.xcodeproj/project.pbxproj index c425c18a91..fa7847fdb2 100644 --- a/Examples/MagicWeather/MagicWeather.xcodeproj/project.pbxproj +++ b/Examples/MagicWeather/MagicWeather.xcodeproj/project.pbxproj @@ -3,17 +3,17 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ + 4E9E1B2E2CAD38EC00B51150 /* RevenueCat in Frameworks */ = {isa = PBXBuildFile; productRef = 4E9E1B2D2CAD38EC00B51150 /* RevenueCat */; }; + 4E9E1B302CAD38EC00B51150 /* RevenueCatUI in Frameworks */ = {isa = PBXBuildFile; productRef = 4E9E1B2F2CAD38EC00B51150 /* RevenueCatUI */; }; 5539DF1D258806A10073FB19 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5539DF1C258806A10073FB19 /* Errors.swift */; }; 5539DF2025880AB80073FB19 /* WeatherViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5539DF1F25880AB80073FB19 /* WeatherViewController.swift */; }; 5539DF24258A9AA70073FB19 /* SampleData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5539DF23258A9AA70073FB19 /* SampleData.swift */; }; - 5539DF2A259283370073FB19 /* PaywallViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5539DF29259283370073FB19 /* PaywallViewController.swift */; }; 5539DF2D2592A07A0073FB19 /* SplashScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5539DF2C2592A0790073FB19 /* SplashScreen.storyboard */; }; 5539DF302592A0C30073FB19 /* SplashScreenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5539DF2F2592A0C30073FB19 /* SplashScreenViewController.swift */; }; - 5539DF362593E3210073FB19 /* Paywall.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5539DF352593E3210073FB19 /* Paywall.storyboard */; }; 5575FD49258801DE001B2F0D /* UserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5575FD48258801DE001B2F0D /* UserViewController.swift */; }; 5576344325A3C08400C0486A /* PackageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5576344225A3C08400C0486A /* PackageCell.swift */; }; 5582ECD72587EF8500ACB34B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5582ECD62587EF8500ACB34B /* AppDelegate.swift */; }; @@ -22,17 +22,14 @@ 5582ECE02587EF8800ACB34B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5582ECDF2587EF8800ACB34B /* Assets.xcassets */; }; 5582ECE32587EF8800ACB34B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5582ECE12587EF8800ACB34B /* LaunchScreen.storyboard */; }; 5582ECFA2587F29600ACB34B /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5582ECF92587F29600ACB34B /* Constants.swift */; }; - 8380C26626FE001500922AB1 /* RevenueCat in Frameworks */ = {isa = PBXBuildFile; productRef = 8380C26526FE001500922AB1 /* RevenueCat */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 5539DF1C258806A10073FB19 /* Errors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Errors.swift; sourceTree = ""; }; 5539DF1F25880AB80073FB19 /* WeatherViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeatherViewController.swift; sourceTree = ""; }; 5539DF23258A9AA70073FB19 /* SampleData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleData.swift; sourceTree = ""; }; - 5539DF29259283370073FB19 /* PaywallViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaywallViewController.swift; sourceTree = ""; }; 5539DF2C2592A0790073FB19 /* SplashScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SplashScreen.storyboard; sourceTree = ""; }; 5539DF2F2592A0C30073FB19 /* SplashScreenViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashScreenViewController.swift; sourceTree = ""; }; - 5539DF352593E3210073FB19 /* Paywall.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Paywall.storyboard; sourceTree = ""; }; 5539DF392593E6D90073FB19 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 5575FD48258801DE001B2F0D /* UserViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserViewController.swift; sourceTree = ""; }; 5576344225A3C08400C0486A /* PackageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PackageCell.swift; sourceTree = ""; }; @@ -51,7 +48,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 8380C26626FE001500922AB1 /* RevenueCat in Frameworks */, + 4E9E1B302CAD38EC00B51150 /* RevenueCatUI in Frameworks */, + 4E9E1B2E2CAD38EC00B51150 /* RevenueCat in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -111,7 +109,6 @@ 5539DF2F2592A0C30073FB19 /* SplashScreenViewController.swift */, 5575FD48258801DE001B2F0D /* UserViewController.swift */, 5539DF1F25880AB80073FB19 /* WeatherViewController.swift */, - 5539DF29259283370073FB19 /* PaywallViewController.swift */, ); path = Controllers; sourceTree = ""; @@ -141,7 +138,6 @@ children = ( 5582ECDC2587EF8500ACB34B /* Main.storyboard */, 5539DF2C2592A0790073FB19 /* SplashScreen.storyboard */, - 5539DF352593E3210073FB19 /* Paywall.storyboard */, ); path = UI; sourceTree = ""; @@ -179,7 +175,8 @@ ); name = MagicWeather; packageProductDependencies = ( - 8380C26526FE001500922AB1 /* RevenueCat */, + 4E9E1B2D2CAD38EC00B51150 /* RevenueCat */, + 4E9E1B2F2CAD38EC00B51150 /* RevenueCatUI */, ); productName = "Magic Weather"; productReference = 5582ECD32587EF8500ACB34B /* MagicWeather.app */; @@ -209,7 +206,7 @@ ); mainGroup = 5582ECCA2587EF8500ACB34B; packageReferences = ( - 5582ECEB2587EFC800ACB34B /* XCRemoteSwiftPackageReference "purchases-ios" */, + 4E9E1B2C2CAD38EC00B51150 /* XCRemoteSwiftPackageReference "purchases-ios-spm" */, ); productRefGroup = 5582ECD42587EF8500ACB34B /* Products */; projectDirPath = ""; @@ -225,7 +222,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5539DF362593E3210073FB19 /* Paywall.storyboard in Resources */, 5582ECE32587EF8800ACB34B /* LaunchScreen.storyboard in Resources */, 5539DF2D2592A07A0073FB19 /* SplashScreen.storyboard in Resources */, 5582ECE02587EF8800ACB34B /* Assets.xcassets in Resources */, @@ -246,7 +242,6 @@ 5582ECD72587EF8500ACB34B /* AppDelegate.swift in Sources */, 5582ECD92587EF8500ACB34B /* SceneDelegate.swift in Sources */, 5539DF2025880AB80073FB19 /* WeatherViewController.swift in Sources */, - 5539DF2A259283370073FB19 /* PaywallViewController.swift in Sources */, 5539DF1D258806A10073FB19 /* Errors.swift in Sources */, 5539DF302592A0C30073FB19 /* SplashScreenViewController.swift in Sources */, 5582ECFA2587F29600ACB34B /* Constants.swift in Sources */, @@ -326,7 +321,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.2; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -381,7 +376,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.2; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -399,7 +394,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = MagicWeather/Resources/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -419,7 +414,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = MagicWeather/Resources/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -455,22 +450,27 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 5582ECEB2587EFC800ACB34B /* XCRemoteSwiftPackageReference "purchases-ios" */ = { + 4E9E1B2C2CAD38EC00B51150 /* XCRemoteSwiftPackageReference "purchases-ios-spm" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/RevenueCat/purchases-ios.git"; + repositoryURL = "https://github.com/RevenueCat/purchases-ios-spm"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 4.0.0; + minimumVersion = 5.5.0; }; }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 8380C26526FE001500922AB1 /* RevenueCat */ = { + 4E9E1B2D2CAD38EC00B51150 /* RevenueCat */ = { isa = XCSwiftPackageProductDependency; - package = 5582ECEB2587EFC800ACB34B /* XCRemoteSwiftPackageReference "purchases-ios" */; + package = 4E9E1B2C2CAD38EC00B51150 /* XCRemoteSwiftPackageReference "purchases-ios-spm" */; productName = RevenueCat; }; + 4E9E1B2F2CAD38EC00B51150 /* RevenueCatUI */ = { + isa = XCSwiftPackageProductDependency; + package = 4E9E1B2C2CAD38EC00B51150 /* XCRemoteSwiftPackageReference "purchases-ios-spm" */; + productName = RevenueCatUI; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 5582ECCB2587EF8500ACB34B /* Project object */; diff --git a/Examples/MagicWeather/MagicWeather.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Examples/MagicWeather/MagicWeather.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index ea0e844592..c1493799b1 100644 --- a/Examples/MagicWeather/MagicWeather.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Examples/MagicWeather/MagicWeather.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,14 +1,15 @@ { + "originHash" : "a3bcaa15a454fa7370ad47de0b4a365f92876b40d5fa0a3e490eb29c4688cd7b", "pins" : [ { - "identity" : "purchases-ios", + "identity" : "purchases-ios-spm", "kind" : "remoteSourceControl", - "location" : "https://github.com/RevenueCat/purchases-ios.git", + "location" : "https://github.com/RevenueCat/purchases-ios-spm", "state" : { - "revision" : "010cf1d4975eceb2f18ca603d1d3413e8f88e841", - "version" : "4.10.1" + "revision" : "c7058bfd80d7f42ca6aa392bf1fab769d1158bf1", + "version" : "5.5.0" } } ], - "version" : 2 + "version" : 3 } diff --git a/Examples/MagicWeather/MagicWeather/Resources/UI/Base.lproj/Main.storyboard b/Examples/MagicWeather/MagicWeather/Resources/UI/Base.lproj/Main.storyboard index cea7930041..59f8453b99 100644 --- a/Examples/MagicWeather/MagicWeather/Resources/UI/Base.lproj/Main.storyboard +++ b/Examples/MagicWeather/MagicWeather/Resources/UI/Base.lproj/Main.storyboard @@ -1,8 +1,9 @@ - + - + + @@ -19,25 +20,25 @@ @@ -64,13 +73,17 @@ + + + + @@ -78,12 +91,13 @@ + - + @@ -91,7 +105,7 @@ - + @@ -108,7 +122,7 @@ - + @@ -128,13 +142,13 @@