Skip to content
This repository has been archived by the owner on Sep 19, 2018. It is now read-only.

Commit

Permalink
Merge pull request #80 from bignerdranch/zwaldowski/rename-prepare
Browse files Browse the repository at this point in the history
Project rename, other fun stuff
  • Loading branch information
Step Christopher committed Dec 17, 2015
2 parents 891eb91 + 3c4678e commit f277c9a
Show file tree
Hide file tree
Showing 36 changed files with 1,231 additions and 1,992 deletions.
29 changes: 19 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
language: objective-c # lies
osx_image: xcode7
before_install: brew uninstall xctool && brew install --HEAD xctool
xcode_project: BNRSwiftJSON.xcodeproj
matrix:
include:
- xcode_sdk: "macosx"
xcode_scheme: "BNRSwiftJSON"
- xcode_sdk: "iphonesimulator"
xcode_scheme: "MobileBNRSwiftJSON"
language: objective-c
osx_image: xcode7.2
install:
- gem install xcpretty --no-rdoc --no-ri --no-document
- curl -OlL "https://github.com/Carthage/Carthage/releases/download/0.11/Carthage.pkg"
- sudo installer -pkg "Carthage.pkg" -target /
- rm "Carthage.pkg"
script:
- open -b com.apple.iphonesimulator # Travis CI workaround
- set -o pipefail && xcodebuild test -scheme 'Freddy' -sdk macosx | xcpretty -c
- set -o pipefail && xcodebuild test -scheme 'MobileFreddy' -sdk iphonesimulator -destination
'platform=iOS Simulator,name=iPhone 5' | xcpretty -c
- set -o pipefail && xcodebuild test -scheme 'TVFreddy' -sdk appletvsimulator -destination
'platform=tvOS Simulator,name=Apple TV 1080p' | xcpretty -c
- carthage build --no-skip-current
- pod lib lint --quick
notifications:
slack:
secure: VHcEZcTuVR3gfHIcM9jcxrXgE3tkVIT4gWDLpnK7O4em86dCpaVkLDwr0UcQYxvqGS1J8pQqGZCwyOBsdgaItX52eRDMIez/384B56Vl6eufdLAcwWELIEtHyFkJ6XUjmASICaeeb8SpF/rj89/AXoHU6c8shY13NKtoBBZCGq8=
29 changes: 0 additions & 29 deletions BNRSwiftJSON.podspec

This file was deleted.

691 changes: 0 additions & 691 deletions BNRSwiftJSON.xcodeproj/project.pbxproj

This file was deleted.

19 changes: 0 additions & 19 deletions BNRSwiftJSON/BNRSwiftJSON.h

This file was deleted.

24 changes: 0 additions & 24 deletions Configurations/BNRSwiftJSON.xcconfig

This file was deleted.

41 changes: 27 additions & 14 deletions Configurations/Base.xcconfig
Original file line number Diff line number Diff line change
@@ -1,31 +1,44 @@
COPY_PHASE_STRIP = NO
ALWAYS_SEARCH_USER_PATHS = NO
CLANG_CXX_LANGUAGE_STANDARD = c++14
GCC_DYNAMIC_NO_PIC = NO
GCC_NO_COMMON_BLOCKS = YES
GCC_C_LANGUAGE_STANDARD = gnu11
CLANG_CXX_LANGUAGE_STANDARD = gnu++0x
CLANG_CXX_LIBRARY = libc++
CLANG_ENABLE_MODULES = YES
CLANG_ENABLE_OBJC_ARC = YES
ENABLE_STRICT_OBJC_MSGSEND = YES
CLANG_WARN_EMPTY_BODY = YES
CLANG_WARN_BOOL_CONVERSION = YES
CLANG_WARN_CONSTANT_CONVERSION = YES
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR
CLANG_WARN_EMPTY_BODY = YES
GCC_WARN_64_TO_32_BIT_CONVERSION = YES
CLANG_WARN_ENUM_CONVERSION = YES
CLANG_WARN_INT_CONVERSION = YES
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR
CLANG_WARN_UNREACHABLE_CODE = YES
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES
COPY_PHASE_STRIP = NO
ENABLE_STRICT_OBJC_MSGSEND = YES
GCC_C_LANGUAGE_STANDARD = gnu99
GCC_DYNAMIC_NO_PIC = NO
GCC_NO_COMMON_BLOCKS = YES
GCC_WARN_64_TO_32_BIT_CONVERSION = YES
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR
GCC_WARN_SIGN_COMPARE = YES
GCC_WARN_UNDECLARED_SELECTOR = YES
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE
CLANG_WARN_UNREACHABLE_CODE = YES
GCC_WARN_UNUSED_FUNCTION = YES
GCC_WARN_UNUSED_VARIABLE = YES
CLANG_ENABLE_MODULES = YES
CLANG_ENABLE_OBJC_ARC = YES
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES
GCC_WARN_UNDECLARED_SELECTOR = YES
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR

CURRENT_PROJECT_VERSION = 1
VERSION_INFO_PREFIX =
VERSIONING_SYSTEM = apple-generic

MACOSX_DEPLOYMENT_TARGET = 10.9
IPHONEOS_DEPLOYMENT_TARGET = 8.0
WATCHOS_DEPLOYMENT_TARGET = 2.0
TVOS_DEPLOYMENT_TARGET = 9.0

ENABLE_BITCODE = YES
ENABLE_BITCODE[sdk=macosx*] = NO

CODE_SIGN_IDENTITY[sdk=macosx*] = -
CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer
CODE_SIGN_IDENTITY[sdk=appletvos*] = iPhone Developer
6 changes: 3 additions & 3 deletions Configurations/Debug.xcconfig
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include "Base.xcconfig"

ONLY_ACTIVE_ARCH = YES
DEBUG_INFORMATION_FORMAT = dwarf
ENABLE_TESTABILITY = YES
ENABLE_NS_ASSERTIONS = YES
VALIDATE_PRODUCT = NO
GCC_OPTIMIZATION_LEVEL = 0
ENABLE_NS_ASSERTIONS = YES
GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1
ONLY_ACTIVE_ARCH = YES
SWIFT_OPTIMIZATION_LEVEL = -Onone
VALIDATE_PRODUCT = NO
23 changes: 23 additions & 0 deletions Configurations/Framework.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
APPLICATION_EXTENSION_API_ONLY = YES
COMBINE_HIDPI_IMAGES = YES

INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks
SKIP_INSTALL = YES

DYLIB_COMPATIBILITY_VERSION = 1
DYLIB_CURRENT_VERSION = 1
DYLIB_INSTALL_NAME_BASE = @rpath

LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks
LD_RUNPATH_SEARCH_PATHS[sdk=iphoneos*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
LD_RUNPATH_SEARCH_PATHS[sdk=iphonesimulator*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
LD_RUNPATH_SEARCH_PATHS[sdk=appletvos*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
LD_RUNPATH_SEARCH_PATHS[sdk=appletvsimulator*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
LD_RUNPATH_SEARCH_PATHS[sdk=watchos*] = $(inherited) @executable_path/Frameworks
LD_RUNPATH_SEARCH_PATHS[sdk=watchsimulator*] = $(inherited) @executable_path/Frameworks

DEFINES_MODULE = YES
FRAMEWORK_VERSION = A
INFOPLIST_FILE = Freddy/Info.plist
PRODUCT_BUNDLE_IDENTIFIER = com.bignerdranch.$(TARGET_NAME)
PRODUCT_NAME = Freddy
6 changes: 3 additions & 3 deletions Configurations/Release.xcconfig
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include "Base.xcconfig"

ONLY_ACTIVE_ARCH = NO
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
ENABLE_TESTABILITY = NO
ENABLE_NS_ASSERTIONS = NO
VALIDATE_PRODUCT = YES
GCC_OPTIMIZATION_LEVEL = s
ENABLE_NS_ASSERTIONS = NO
GCC_PREPROCESSOR_DEFINITIONS =
ONLY_ACTIVE_ARCH = NO
SWIFT_OPTIMIZATION_LEVEL = -O
VALIDATE_PRODUCT = YES
16 changes: 9 additions & 7 deletions Configurations/Tests.xcconfig
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks
LD_RUNPATH_SEARCH_PATHS[sdk=iphoneos*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
LD_RUNPATH_SEARCH_PATHS[sdk=iphonesimulator*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
COMBINE_HIDPI_IMAGES = YES

INFOPLIST_FILE = BNRSwiftJSONTests/Info.plist
PRODUCT_BUNDLE_IDENTIFIER = com.bignerdranch.BNRSwiftJSON-Tests
PRODUCT_NAME = $(TARGET_NAME)
LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks
LD_RUNPATH_SEARCH_PATHS[sdk=iphoneos*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
LD_RUNPATH_SEARCH_PATHS[sdk=iphonesimulator*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
LD_RUNPATH_SEARCH_PATHS[sdk=appletvos*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
LD_RUNPATH_SEARCH_PATHS[sdk=appletvsimulator*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks

CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer
INFOPLIST_FILE = FreddyTests/Info.plist
PRODUCT_BUNDLE_IDENTIFIER = com.bignerdranch.$(TARGET_NAME)
PRODUCT_NAME = $(TARGET_NAME)
31 changes: 31 additions & 0 deletions Freddy.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
Pod::Spec.new do |s|

s.name = "Freddy"
s.version = "2.0.0b1"
s.summary = "A JSON parsing library written in Swift"

s.description = <<-DESC
Freddy is a reusable framework for parsing JSON in Swift.
Its primary goal is to faciliate the safe parsing of JSON,
while also preserving the ease of use presented by parsing
JSON in Objective-C.
DESC

s.homepage = "https://github.com/bignerdranch/Freddy"

s.license = { :type => "MIT", :file => "LICENSE" }

s.authors = {"Matt Mathias" => "mattm@bignerdranch.com",
"John Gallagher" => "jgallagher@bignerdranch.com",
"Zachary Waldowski" => "zachary@bignerdranch.com"}

s.ios.deployment_target = "8.0"
s.osx.deployment_target = "10.10"
s.watchos.deployment_target = "2.0"

s.source = {:git => "https://github.com/bignerdranch/Freddy.git", :tag => "v#{s.version}"}
s.source_files = "Freddy/*.swift"

s.requires_arc = true

end

0 comments on commit f277c9a

Please sign in to comment.