Skip to content

Commit

Permalink
Update dependencies and CocoaPodsTest (#206)
Browse files Browse the repository at this point in the history
* Update dependencies

* Make CocoaPodsTest use same code as TripKitUIExample

* CocoaPodsTest compile fix
  • Loading branch information
nighthawk authored Oct 29, 2022
1 parent 5b3b7c7 commit 64d2b22
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 187 deletions.
79 changes: 53 additions & 26 deletions Examples/CocoaPodsTest/CocoaPodsTest.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,32 @@
objects = {

/* Begin PBXBuildFile section */
3A6BBD72232A305100D87E99 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A6BBD71232A305100D87E99 /* AppDelegate.swift */; };
3A6BBD74232A305100D87E99 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A6BBD73232A305100D87E99 /* SceneDelegate.swift */; };
3A6BBD76232A305100D87E99 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A6BBD75232A305100D87E99 /* ContentView.swift */; };
3A50719E290CA88E00C5590F /* InMemoryHistoryManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A507199290CA88E00C5590F /* InMemoryHistoryManager.swift */; };
3A50719F290CA88E00C5590F /* InMemoryHistoryManager+Home.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A50719A290CA88E00C5590F /* InMemoryHistoryManager+Home.swift */; };
3A5071A0290CA88E00C5590F /* InMemoryFavoriteManager+Autocompleting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A50719B290CA88E00C5590F /* InMemoryFavoriteManager+Autocompleting.swift */; };
3A5071A1290CA88E00C5590F /* InMemoryHistoryManager+Autocompleting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A50719C290CA88E00C5590F /* InMemoryHistoryManager+Autocompleting.swift */; };
3A5071A2290CA88E00C5590F /* InMemoryFavoriteManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A50719D290CA88E00C5590F /* InMemoryFavoriteManager.swift */; };
3A5071A6290CA8BB00C5590F /* ExampleCustomizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A5071A3290CA8BB00C5590F /* ExampleCustomizer.swift */; };
3A5071A7290CA8BB00C5590F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A5071A4290CA8BB00C5590F /* AppDelegate.swift */; };
3A5071A8290CA8BB00C5590F /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A5071A5290CA8BB00C5590F /* ViewController.swift */; };
3A5071AB290CA8C100C5590F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3A5071A9290CA8C100C5590F /* Main.storyboard */; };
3A6BBD78232A305100D87E99 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3A6BBD77232A305100D87E99 /* Assets.xcassets */; };
3A6BBD7B232A305100D87E99 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3A6BBD7A232A305100D87E99 /* Preview Assets.xcassets */; };
3A6BBD7E232A305100D87E99 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3A6BBD7C232A305100D87E99 /* LaunchScreen.storyboard */; };
83B87E55C4668F0D436AD360 /* Pods_CocoaPodsTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47D544A7703EE7BECA793C1D /* Pods_CocoaPodsTest.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
3A507199290CA88E00C5590F /* InMemoryHistoryManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InMemoryHistoryManager.swift; sourceTree = "<group>"; };
3A50719A290CA88E00C5590F /* InMemoryHistoryManager+Home.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "InMemoryHistoryManager+Home.swift"; sourceTree = "<group>"; };
3A50719B290CA88E00C5590F /* InMemoryFavoriteManager+Autocompleting.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "InMemoryFavoriteManager+Autocompleting.swift"; sourceTree = "<group>"; };
3A50719C290CA88E00C5590F /* InMemoryHistoryManager+Autocompleting.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "InMemoryHistoryManager+Autocompleting.swift"; sourceTree = "<group>"; };
3A50719D290CA88E00C5590F /* InMemoryFavoriteManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InMemoryFavoriteManager.swift; sourceTree = "<group>"; };
3A5071A3290CA8BB00C5590F /* ExampleCustomizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ExampleCustomizer.swift; path = ../../TripKitUIExample/ExampleCustomizer.swift; sourceTree = "<group>"; };
3A5071A4290CA8BB00C5590F /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = ../../TripKitUIExample/AppDelegate.swift; sourceTree = "<group>"; };
3A5071A5290CA8BB00C5590F /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewController.swift; path = ../../TripKitUIExample/ViewController.swift; sourceTree = "<group>"; };
3A5071AA290CA8C100C5590F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = ../../TripKitUIExample/Base.lproj/Main.storyboard; sourceTree = "<group>"; };
3A6BBD6E232A305100D87E99 /* CocoaPodsTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CocoaPodsTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
3A6BBD71232A305100D87E99 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3A6BBD73232A305100D87E99 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
3A6BBD75232A305100D87E99 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
3A6BBD77232A305100D87E99 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
3A6BBD7A232A305100D87E99 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
3A6BBD7D232A305100D87E99 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
3A6BBD7F232A305100D87E99 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
47D544A7703EE7BECA793C1D /* Pods_CocoaPodsTest.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CocoaPodsTest.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -50,6 +60,19 @@
name = Frameworks;
sourceTree = "<group>";
};
3A507198290CA88E00C5590F /* Autocompleter */ = {
isa = PBXGroup;
children = (
3A507199290CA88E00C5590F /* InMemoryHistoryManager.swift */,
3A50719A290CA88E00C5590F /* InMemoryHistoryManager+Home.swift */,
3A50719B290CA88E00C5590F /* InMemoryFavoriteManager+Autocompleting.swift */,
3A50719C290CA88E00C5590F /* InMemoryHistoryManager+Autocompleting.swift */,
3A50719D290CA88E00C5590F /* InMemoryFavoriteManager.swift */,
);
name = Autocompleter;
path = ../../TripKitUIExample/Autocompleter;
sourceTree = "<group>";
};
3A6BBD65232A305100D87E99 = {
isa = PBXGroup;
children = (
Expand All @@ -71,25 +94,18 @@
3A6BBD70232A305100D87E99 /* CocoaPodsTest */ = {
isa = PBXGroup;
children = (
3A6BBD71232A305100D87E99 /* AppDelegate.swift */,
3A6BBD73232A305100D87E99 /* SceneDelegate.swift */,
3A6BBD75232A305100D87E99 /* ContentView.swift */,
3A507198290CA88E00C5590F /* Autocompleter */,
3A5071A4290CA8BB00C5590F /* AppDelegate.swift */,
3A5071A3290CA8BB00C5590F /* ExampleCustomizer.swift */,
3A5071A5290CA8BB00C5590F /* ViewController.swift */,
3A5071A9290CA8C100C5590F /* Main.storyboard */,
3A6BBD77232A305100D87E99 /* Assets.xcassets */,
3A6BBD7C232A305100D87E99 /* LaunchScreen.storyboard */,
3A6BBD7F232A305100D87E99 /* Info.plist */,
3A6BBD79232A305100D87E99 /* Preview Content */,
);
path = CocoaPodsTest;
sourceTree = "<group>";
};
3A6BBD79232A305100D87E99 /* Preview Content */ = {
isa = PBXGroup;
children = (
3A6BBD7A232A305100D87E99 /* Preview Assets.xcassets */,
);
path = "Preview Content";
sourceTree = "<group>";
};
B84D1EE64651EA1A13170318 /* Pods */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -160,8 +176,8 @@
buildActionMask = 2147483647;
files = (
3A6BBD7E232A305100D87E99 /* LaunchScreen.storyboard in Resources */,
3A6BBD7B232A305100D87E99 /* Preview Assets.xcassets in Resources */,
3A6BBD78232A305100D87E99 /* Assets.xcassets in Resources */,
3A5071AB290CA8C100C5590F /* Main.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -214,15 +230,28 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3A6BBD72232A305100D87E99 /* AppDelegate.swift in Sources */,
3A6BBD74232A305100D87E99 /* SceneDelegate.swift in Sources */,
3A6BBD76232A305100D87E99 /* ContentView.swift in Sources */,
3A5071A1290CA88E00C5590F /* InMemoryHistoryManager+Autocompleting.swift in Sources */,
3A5071A6290CA8BB00C5590F /* ExampleCustomizer.swift in Sources */,
3A5071A0290CA88E00C5590F /* InMemoryFavoriteManager+Autocompleting.swift in Sources */,
3A50719E290CA88E00C5590F /* InMemoryHistoryManager.swift in Sources */,
3A5071A7290CA8BB00C5590F /* AppDelegate.swift in Sources */,
3A5071A2290CA88E00C5590F /* InMemoryFavoriteManager.swift in Sources */,
3A5071A8290CA8BB00C5590F /* ViewController.swift in Sources */,
3A50719F290CA88E00C5590F /* InMemoryHistoryManager+Home.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXVariantGroup section */
3A5071A9290CA8C100C5590F /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
3A5071AA290CA8C100C5590F /* Base */,
);
name = Main.storyboard;
sourceTree = "<group>";
};
3A6BBD7C232A305100D87E99 /* LaunchScreen.storyboard */ = {
isa = PBXVariantGroup;
children = (
Expand Down Expand Up @@ -354,7 +383,6 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_ASSET_PATHS = "\"CocoaPodsTest/Preview Content\"";
DEVELOPMENT_TEAM = "";
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = CocoaPodsTest/Info.plist;
Expand All @@ -375,7 +403,6 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_ASSET_PATHS = "\"CocoaPodsTest/Preview Content\"";
DEVELOPMENT_TEAM = "";
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = CocoaPodsTest/Info.plist;
Expand Down
37 changes: 0 additions & 37 deletions Examples/CocoaPodsTest/CocoaPodsTest/AppDelegate.swift

This file was deleted.

21 changes: 0 additions & 21 deletions Examples/CocoaPodsTest/CocoaPodsTest/ContentView.swift

This file was deleted.

24 changes: 5 additions & 19 deletions Examples/CocoaPodsTest/CocoaPodsTest/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,11 @@
<string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
<false/>
<key>UISceneConfigurations</key>
<dict>
<key>UIWindowSceneSessionRoleApplication</key>
<array>
<dict>
<key>UISceneConfigurationName</key>
<string>Default Configuration</string>
<key>UISceneDelegateClassName</key>
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
</dict>
</array>
</dict>
</dict>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>

<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
Expand Down

This file was deleted.

64 changes: 0 additions & 64 deletions Examples/CocoaPodsTest/CocoaPodsTest/SceneDelegate.swift

This file was deleted.

22 changes: 11 additions & 11 deletions Examples/CocoaPodsTest/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
PODS:
- Kingfisher (7.2.0)
- Kingfisher (7.4.1)
- RxCocoa (6.5.0):
- RxRelay (= 6.5.0)
- RxSwift (= 6.5.0)
- RxRelay (6.5.0):
- RxSwift (= 6.5.0)
- RxSwift (6.5.0)
- TGCardViewController (2.1.2)
- TripKit (4.0-rc3)
- TripKitInterApp (4.0-rc3):
- TripKit (~> 4.0-rc3)
- TripKitUI (4.0-rc3):
- TripKit (4.0.2)
- TripKitInterApp (4.0.0):
- TripKit (~> 4.0.0)
- TripKitUI (4.0.2):
- Kingfisher (~> 7.0)
- RxCocoa (~> 6.5)
- RxSwift (~> 6.5)
- TGCardViewController (>= 2.1)
- TripKit (~> 4.0-rc3)
- TripKit (~> 4.0.2)

DEPENDENCIES:
- TripKit (from `../../`)
Expand All @@ -39,15 +39,15 @@ EXTERNAL SOURCES:
:path: "../../"

SPEC CHECKSUMS:
Kingfisher: 3ac0b75b155cabc0e544877d1a4deea29feece92
Kingfisher: cd762a593a61b2fbecf7645c00f9a801a3ebfc9c
RxCocoa: 94f817b71c07517321eb4f9ad299112ca8af743b
RxRelay: 1de1523e604c72b6c68feadedd1af3b1b4d0ecbd
RxSwift: 5710a9e6b17f3c3d6e40d6e559b9fa1e813b2ef8
TGCardViewController: a19c5fad9f8352f75a7cd0663292d63c693b9947
TripKit: f1cb6cf065feb1654a3b9e44ec482a90681b8c56
TripKitInterApp: 1b4f79813eff7251b1d45e9c760ed351884ee24b
TripKitUI: 94b521b1b30d94dcb0ee5f0e9117c074275b37fc
TripKit: 4ddfba1c68012ca2f4a126ac171677db2ff4859a
TripKitInterApp: e456edda33b3ab738969d1c064e13aaf3d3d7732
TripKitUI: 66c9bda5ecfe91ed048d8a719dbffe0dd6be0422

PODFILE CHECKSUM: a2ca0312f3711cec4dd98455d47462fd95511a05

COCOAPODS: 1.11.2
COCOAPODS: 1.11.3
2 changes: 1 addition & 1 deletion Examples/TripKitUIExample/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ extension MainViewController {
InMemoryHistoryManager.shared,
]
homeController.searchResultsDelegate = self
navigationController?.setNavigationBarHidden(true, animated: true)
navigationController?.setNavigationBarHidden(false, animated: true)
navigationController?.pushViewController(homeController, animated: true)
}

Expand Down
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/onevcat/Kingfisher.git",
"state": {
"branch": null,
"revision": "be1a1acb283a702b99b630f586877ba02234b4cb",
"version": "7.3.2"
"revision": "44e891bdb61426a95e31492a67c7c0dfad1f87c5",
"version": "7.4.1"
}
},
{
Expand Down

0 comments on commit 64d2b22

Please sign in to comment.