2.0.0

SwiftScream · Jul 9, 2018 · 442eef2 · 442eef2
2 parents 6932279 + 415d748
commit 442eef2
Show file tree

Hide file tree

Showing 30 changed files with 211 additions and 1,022 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: swift
 os: osx
-osx_image: xcode9.3
+osx_image: xcode9.4
 
 install: gem install xcpretty
 
@@ -17,11 +17,3 @@ jobs:
       - bash <(curl -s https://codecov.io/bash) -J Tests-tv -F tv
     - script:
       - set -o pipefail && xcodebuild build -project URITemplate.xcodeproj -scheme URITemplate-watch | xcpretty -c
-    - script:
-      - set -o pipefail && xcodebuild build -project URITemplate.xcodeproj -scheme URITemplate-ios-d | xcpretty -c
-    - script:
-      - set -o pipefail && xcodebuild build -project URITemplate.xcodeproj -scheme URITemplate-mac-d | xcpretty -c
-    - script:
-      - set -o pipefail && xcodebuild build -project URITemplate.xcodeproj -scheme URITemplate-tv-d | xcpretty -c
-    - script:
-      - set -o pipefail && xcodebuild build -project URITemplate.xcodeproj -scheme URITemplate-watch-d | xcpretty -c
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+<a name="2.0.0"></a>
+# [2.0.0](https://github.com/SwiftScream/URITemplate/compare/1.1.1...2.0.0) (2018-07-09)
+
+- Provide Static Framework Targets
+- Remove Static Library and Dynamic Framework Targets
+
+
 <a name="1.1.1"></a>
 # [1.1.1](https://github.com/SwiftScream/URITemplate/compare/1.1.0...1.1.1) (2018-07-01)
 

diff --git a/Configuration/DynamicLibTarget-ios.xcconfig b/Configuration/DynamicLibTarget-ios.xcconfig
diff --git a/Configuration/ExampleTarget-ios.xcconfig b/Configuration/ExampleTarget-ios.xcconfig
@@ -8,7 +8,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.swiftscream.URITemplateExample
 PRODUCT_NAME = $(TARGET_NAME)
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
 
-OTHER_LDFLAGS = -lURITemplate-ios
+OTHER_LDFLAGS = -framework URITemplate
 
 CODE_SIGN_IDENTITY = iOS Developer
 CODE_SIGN_STYLE = Automatic

diff --git a/Configuration/ExampleTarget-mac.xcconfig b/Configuration/ExampleTarget-mac.xcconfig
@@ -3,4 +3,4 @@ MACOSX_DEPLOYMENT_TARGET = 10.12
 
 PRODUCT_NAME = $(TARGET_NAME)
 
-OTHER_LDFLAGS = -lURITemplate-mac
+OTHER_LDFLAGS = -framework URITemplate
diff --git a/Configuration/ExampleTarget-tv.xcconfig b/Configuration/ExampleTarget-tv.xcconfig
@@ -9,7 +9,7 @@ PRODUCT_NAME = $(TARGET_NAME)
 ASSETCATALOG_COMPILER_APPICON_NAME = App Icon & Top Shelf Image
 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage
 
-OTHER_LDFLAGS = -lURITemplate-tv
+OTHER_LDFLAGS = -framework URITemplate
 
 CODE_SIGN_IDENTITY = iOS Developer
 CODE_SIGN_STYLE = Automatic

diff --git a/Configuration/ExampleTarget-watch-ext.xcconfig b/Configuration/ExampleTarget-watch-ext.xcconfig
@@ -9,7 +9,7 @@ INFOPLIST_FILE = Example-watch/Extension/Info.plist
 PRODUCT_BUNDLE_IDENTIFIER = com.swiftscream.URITemplateExample.watchkitapp.watchkitextension
 PRODUCT_NAME = $(TARGET_NAME)
 
-OTHER_LDFLAGS = -lURITemplate-watch
+OTHER_LDFLAGS = -framework URITemplate
 
 CODE_SIGN_IDENTITY = iOS Developer
 CODE_SIGN_STYLE = Automatic

diff --git a/...iguration/DynamicLibTarget-watch.xcconfig → Configuration/FrameworkTarget-ios.xcconfig b/...iguration/DynamicLibTarget-watch.xcconfig → Configuration/FrameworkTarget-ios.xcconfig
@@ -1,15 +1,18 @@
-#include "StaticLibTarget-watch.xcconfig"
-
-DYLIB_COMPATIBILITY_VERSION = 1
-DYLIB_CURRENT_VERSION = 1
-DYLIB_INSTALL_NAME_BASE = @rpath
+SDKROOT = iphoneos
+IPHONEOS_DEPLOYMENT_TARGET = 9.0
+TARGETED_DEVICE_FAMILY = 1,2
 
+SKIP_INSTALL = YES
 OTHER_LDFLAGS = -ObjC -all_load
 LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
+PRODUCT_NAME = URITemplate
+PRODUCT_MODULE_NAME = URITemplate
 
-CODE_SIGN_IDENTITY =
+DYLIB_COMPATIBILITY_VERSION = 1
+DYLIB_CURRENT_VERSION = 1
+DYLIB_INSTALL_NAME_BASE = @rpath
 
+MACH_O_TYPE = staticlib
 DEFINES_MODULE = YES
-INFOPLIST_FILE = Source/DynamicFrameworkInfo.plist
+INFOPLIST_FILE = Source/FrameworkInfo.plist
 PRODUCT_BUNDLE_IDENTIFIER = com.swiftscream.URITemplate
-PRODUCT_NAME = URITemplate
diff --git a/Configuration/DynamicLibTarget-mac.xcconfig → Configuration/FrameworkTarget-mac.xcconfig b/Configuration/DynamicLibTarget-mac.xcconfig → Configuration/FrameworkTarget-mac.xcconfig
@@ -1,5 +1,9 @@
-#include "StaticLibTarget-mac.xcconfig"
-EXECUTABLE_PREFIX =
+SDKROOT = macosx
+MACOSX_DEPLOYMENT_TARGET = 10.11
+
+SKIP_INSTALL = YES
+PRODUCT_NAME = URITemplate
+PRODUCT_MODULE_NAME = URITemplate
 
 DYLIB_COMPATIBILITY_VERSION = 1
 DYLIB_CURRENT_VERSION = 1
@@ -8,7 +12,7 @@ DYLIB_INSTALL_NAME_BASE = @rpath
 OTHER_LDFLAGS = -ObjC -all_load
 LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks
 
+MACH_O_TYPE = staticlib
 DEFINES_MODULE = YES
-INFOPLIST_FILE = Source/DynamicFrameworkInfo.plist
+INFOPLIST_FILE = Source/FrameworkInfo.plist
 PRODUCT_BUNDLE_IDENTIFIER = com.swiftscream.URITemplate
-PRODUCT_NAME = URITemplate
diff --git a/Configuration/DynamicLibTarget-tv.xcconfig → Configuration/FrameworkTarget-tv.xcconfig b/Configuration/DynamicLibTarget-tv.xcconfig → Configuration/FrameworkTarget-tv.xcconfig
@@ -1,15 +1,20 @@
-#include "StaticLibTarget-tv.xcconfig"
+SDKROOT = appletvos
+TVOS_DEPLOYMENT_TARGET = 9.0
+TARGETED_DEVICE_FAMILY = 3
+
+SKIP_INSTALL = YES
+OTHER_LDFLAGS = -ObjC -all_load
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
+PRODUCT_NAME = URITemplate
+PRODUCT_MODULE_NAME = URITemplate
 
 DYLIB_COMPATIBILITY_VERSION = 1
 DYLIB_CURRENT_VERSION = 1
 DYLIB_INSTALL_NAME_BASE = @rpath
 
-OTHER_LDFLAGS = -ObjC -all_load
-LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
-
 CODE_SIGN_IDENTITY =
 
+MACH_O_TYPE = staticlib
 DEFINES_MODULE = YES
-INFOPLIST_FILE = Source/DynamicFrameworkInfo.plist
+INFOPLIST_FILE = Source/FrameworkInfo.plist
 PRODUCT_BUNDLE_IDENTIFIER = com.swiftscream.URITemplate
-PRODUCT_NAME = URITemplate
diff --git a/Configuration/FrameworkTarget-watch.xcconfig b/Configuration/FrameworkTarget-watch.xcconfig
@@ -0,0 +1,22 @@
+SDKROOT = watchos
+WATCHOS_DEPLOYMENT_TARGET = 2.0
+TARGETED_DEVICE_FAMILY = 4
+
+APPLICATION_EXTENSION_API_ONLY = YES
+
+SKIP_INSTALL = YES
+OTHER_LDFLAGS = -ObjC -all_load
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
+PRODUCT_NAME = URITemplate
+PRODUCT_MODULE_NAME = URITemplate
+
+DYLIB_COMPATIBILITY_VERSION = 1
+DYLIB_CURRENT_VERSION = 1
+DYLIB_INSTALL_NAME_BASE = @rpath
+
+CODE_SIGN_IDENTITY =
+
+MACH_O_TYPE = staticlib
+DEFINES_MODULE = YES
+INFOPLIST_FILE = Source/FrameworkInfo.plist
+PRODUCT_BUNDLE_IDENTIFIER = com.swiftscream.URITemplate
diff --git a/Configuration/Project.xcconfig b/Configuration/Project.xcconfig
@@ -10,6 +10,6 @@ ENABLE_STRICT_OBJC_MSGSEND = YES
 SWIFT_VERSION = 4.1
 SWIFT_TREAT_WARNINGS_AS_ERRORS = YES
 
-CURRENT_PROJECT_VERSION = 1.1.1
+CURRENT_PROJECT_VERSION = 2.0.0
 
 #include "Warnings.xcconfig"
diff --git a/Configuration/StaticLibTarget-ios.xcconfig b/Configuration/StaticLibTarget-ios.xcconfig
diff --git a/Configuration/StaticLibTarget-mac.xcconfig b/Configuration/StaticLibTarget-mac.xcconfig
diff --git a/Configuration/StaticLibTarget-tv.xcconfig b/Configuration/StaticLibTarget-tv.xcconfig
diff --git a/Configuration/StaticLibTarget-watch.xcconfig b/Configuration/StaticLibTarget-watch.xcconfig
diff --git a/Example-ios/ViewController.swift b/Example-ios/ViewController.swift
@@ -33,9 +33,9 @@ class ViewController: UIViewController {
             let url = URL(string: urlString)!
             print("Expanding \(template)\n     with \(variables):\n")
             print(url.absoluteString)
-        } catch URITemplate.Error.malformedTemplate(let position, let reason) {
+        } catch URITemplate.Error.malformedTemplate(_, let reason) {
             print("Failed parsing template (\(reason))")
-        } catch URITemplate.Error.expansionFailure(let position, let reason) {
+        } catch URITemplate.Error.expansionFailure(_, let reason) {
             print("Failed expanding template (\(reason))")
         } catch {
             print("Unexpected Failure")

diff --git a/Example-tv/ViewController.swift b/Example-tv/ViewController.swift
@@ -33,9 +33,9 @@ class ViewController: UIViewController {
             let url = URL(string: urlString)!
             print("Expanding \(template)\n     with \(variables):\n")
             print(url.absoluteString)
-        } catch URITemplate.Error.malformedTemplate(let position, let reason) {
+        } catch URITemplate.Error.malformedTemplate(_, let reason) {
             print("Failed parsing template (\(reason))")
-        } catch URITemplate.Error.expansionFailure(let position, let reason) {
+        } catch URITemplate.Error.expansionFailure(_, let reason) {
             print("Failed expanding template (\(reason))")
         } catch {
             print("Unexpected Failure")

diff --git a/Example-watch/Extension/InterfaceController.swift b/Example-watch/Extension/InterfaceController.swift
@@ -32,9 +32,9 @@ class InterfaceController: WKInterfaceController {
             let url = URL(string: urlString)!
             print("Expanding \(template)\n     with \(variables):\n")
             print(url.absoluteString)
-        } catch URITemplate.Error.malformedTemplate(let position, let reason) {
+        } catch URITemplate.Error.malformedTemplate(_, let reason) {
             print("Failed parsing template (\(reason))")
-        } catch URITemplate.Error.expansionFailure(let position, let reason) {
+        } catch URITemplate.Error.expansionFailure(_, let reason) {
             print("Failed expanding template (\(reason))")
         } catch {
             print("Unexpected Failure")

diff --git a/ScreamURITemplate.podspec b/ScreamURITemplate.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = "ScreamURITemplate"
-  s.version = "1.1.1"
+  s.version = "2.0.0"
   s.summary = "Robust and performant Swift implementation of RFC6570 URI Template"
   s.homepage = "https://github.com/SwiftScream/URITemplate"
   s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }

diff --git a/Source/DynamicFrameworkInfo.plist → Source/FrameworkInfo.plist b/Source/DynamicFrameworkInfo.plist → Source/FrameworkInfo.plist
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@ MACOSX_DEPLOYMENT_TARGET = 10.12

		PRODUCT_NAME = $(TARGET_NAME)

		OTHER_LDFLAGS = -lURITemplate-mac
		OTHER_LDFLAGS = -framework URITemplate