ref HeroTransitions#623 - revert target settings and make sure Exampl…

…e still works (in simulator)
nick-potts · Dec 16, 2019 · 5b51fee · 5b51fee
1 parent 3859059
commit 5b51fee
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/Examples/MainViewController.swift b/Examples/MainViewController.swift
@@ -24,11 +24,14 @@ class MainViewController: UIViewController {
     let dataSource = ArrayDataSource<SourceData>(data: [
       (BuiltInTransitionExampleViewController1.self, "Built In Animations"),
       (MatchExampleViewController1.self, "Match Animation"),
-      (SwiftUIMatchExampleViewController.self, "Match SwiftUI"),
       (MatchInCollectionExampleViewController1.self, "Match Cell in Collection"),
       (AppStoreViewController1.self, "App Store Transition"),
       ])
 
+    if #available(iOS 13.0, *) {
+      dataSource.data.insert((SwiftUIMatchExampleViewController.self, "Match SwiftUI"), at: 2)
+    }
+
     let viewSource = ClosureViewSource { (label: UILabel, data: SourceData, index) in
       label.text = "\(index + 1). \(data.1)"
       label.textAlignment = .center

diff --git a/Examples/SwiftUIMatchExample.swift b/Examples/SwiftUIMatchExample.swift
@@ -1,6 +1,8 @@
 import UIKit
 import SwiftUI
 
+
+@available(iOS 13.0, *)
 class SwiftUIMatchExampleViewController: UIHostingController<ImagesTableView> {
 
   override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
@@ -30,6 +32,7 @@ struct ImageInfo: Identifiable {
   let name: String
 }
 
+@available(iOS 13.0, *)
 struct ImagesTableView: View {
 
   var onTapRow: ((ImageInfo)->())?
@@ -50,9 +53,7 @@ struct ImagesTableView: View {
   }
 }
 
-#if DEBUG
-#endif
-
+@available(iOS 13.0, *)
 struct ImageViewWrapper: View, UIViewRepresentable {
 
   let name: String
@@ -68,16 +69,18 @@ struct ImageViewWrapper: View, UIViewRepresentable {
   }
 }
 
-//MARK: - Previews
+//MARK: - Previews (Will only work when target of HeroExamples is set to iOS 13 +)
 
 #if DEBUG
 
+@available(iOS 13.0, *)
 struct ImagesTableView_Previews: PreviewProvider {
   static var previews: some View {
     ImagesTableView(onTapRow: nil)
   }
 }
 
+@available(iOS 13.0, *)
 struct ImageViewWrapper_Previews: PreviewProvider {
   static var previews: some View {
     ImageViewWrapper(name: "Unsplash0", heroID: nil)

diff --git a/Hero.xcodeproj/project.pbxproj b/Hero.xcodeproj/project.pbxproj
@@ -1436,7 +1436,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "$(SRCROOT)/Examples/Resources/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MARKETING_VERSION = 1.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.HeroExamples;
@@ -1453,7 +1453,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "$(SRCROOT)/Examples/Resources/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MARKETING_VERSION = 1.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.HeroExamples;