Merge pull request #3 from jayway/carthage_support

Carthage support merge

Example/CollectionAndTableViewCompatible.xcodeproj/xcshareddata/xcschemes/CollectionAndTableViewCompatible-Example.xcscheme → CollectionAndTableViewCompatible.xcodeproj/xcshareddata/xcschemes/CollectionAndTableViewCompatible.xcscheme

@@ -14,23 +14,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-               BuildableName = "CollectionAndTableViewCompatible_Example.app"
-               BlueprintName = "CollectionAndTableViewCompatible_Example"
-               ReferencedContainer = "container:CollectionAndTableViewCompatible.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "607FACE41AFB9204008FA782"
-               BuildableName = "CollectionAndTableViewCompatible_Tests.xctest"
-               BlueprintName = "CollectionAndTableViewCompatible_Tests"
+               BlueprintIdentifier = "356722C3224B72D200E67BE4"
+               BuildableName = "CollectionAndTableViewCompatible.framework"
+               BlueprintName = "CollectionAndTableViewCompatible"
                ReferencedContainer = "container:CollectionAndTableViewCompatible.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -42,26 +28,7 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "607FACE41AFB9204008FA782"
-               BuildableName = "CollectionAndTableViewCompatible_Tests.xctest"
-               BlueprintName = "CollectionAndTableViewCompatible_Tests"
-               ReferencedContainer = "container:CollectionAndTableViewCompatible.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-            BuildableName = "CollectionAndTableViewCompatible_Example.app"
-            BlueprintName = "CollectionAndTableViewCompatible_Example"
-            ReferencedContainer = "container:CollectionAndTableViewCompatible.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>
@@ -75,16 +42,15 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-            BuildableName = "CollectionAndTableViewCompatible_Example.app"
-            BlueprintName = "CollectionAndTableViewCompatible_Example"
+            BlueprintIdentifier = "356722C3224B72D200E67BE4"
+            BuildableName = "CollectionAndTableViewCompatible.framework"
+            BlueprintName = "CollectionAndTableViewCompatible"
             ReferencedContainer = "container:CollectionAndTableViewCompatible.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
@@ -94,16 +60,15 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-            BuildableName = "CollectionAndTableViewCompatible_Example.app"
-            BlueprintName = "CollectionAndTableViewCompatible_Example"
+            BlueprintIdentifier = "356722C3224B72D200E67BE4"
+            BuildableName = "CollectionAndTableViewCompatible.framework"
+            BlueprintName = "CollectionAndTableViewCompatible"
             ReferencedContainer = "container:CollectionAndTableViewCompatible.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

CollectionAndTableViewCompatible/CollectionAndTableViewCompatible.h

@@ -0,0 +1,18 @@
+//
+//  CollectionAndTableViewCompatible.h
+//  CollectionAndTableViewCompatible
+//
+//  Created by Fredrik Nannestad on 27/03/2019.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for CollectionAndTableViewCompatible.
+FOUNDATION_EXPORT double CollectionAndTableViewCompatibleVersionNumber;
+
+//! Project version string for CollectionAndTableViewCompatible.
+FOUNDATION_EXPORT const unsigned char CollectionAndTableViewCompatibleVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <CollectionAndTableViewCompatible/PublicHeader.h>
+
+

Example/Tests/Info.plist → CollectionAndTableViewCompatible/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -13,12 +13,10 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
+	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
 </plist>

Example/CollectionAndTableViewCompatible/AppDelegate.swift → Demo/AppDelegate.swift

@@ -1,9 +1,9 @@
 //
 //  AppDelegate.swift
-//  CollectionAndTableViewCompatible
+//  TableViewCompatible
 //
-//  Created by Jimmie Jensen on 02/22/2017.
-//  Copyright (c) 2017 Jimmie Jensen. All rights reserved.
+//  Created by Fredrik Nannestad on 21/10/2016.
+//  Copyright © 2016 Fredrik Nannestad. All rights reserved.
 //
 
 import UIKit
@@ -21,7 +21,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func applicationWillResignActive(_ application: UIApplication) {
         // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-        // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+        // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
     }
 
     func applicationDidEnterBackground(_ application: UIApplication) {
@@ -30,7 +30,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     func applicationWillEnterForeground(_ application: UIApplication) {
-        // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
+        // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
     }
 
     func applicationDidBecomeActive(_ application: UIApplication) {

Demo/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,93 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/Assets.xcassets/fredrik.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "fredrik.jpg",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/Assets.xcassets/gridTabBarIcon.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "gridTabBarIcon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "gridTabBarIcon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "gridTabBarIcon@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/Assets.xcassets/listTabBarIcon.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "listTabBarIcon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "listTabBarIcon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "listTabBarIcon@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/AutolayoutTableView.swift

@@ -0,0 +1,27 @@
+//
+//  AutolayoutTableView.swift
+//  TableViewCompatible
+//
+//  Created by Fredrik Nannestad on 26/10/2016.
+//  Copyright © 2016 Fredrik Nannestad. All rights reserved.
+//
+
+import UIKit
+
+extension UITableView {
+
+    func enableAutolayoutForCellHeights(estimatedRowHeight: CGFloat = 44) {
+        self.estimatedRowHeight = estimatedRowHeight
+        self.rowHeight = UITableView.automaticDimension
+    }
+
+}
+
+class AutolayoutTableView: UITableView {
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        self.enableAutolayoutForCellHeights()
+    }
+
+}