Merge pull request #123 from tid-kijyun/develop

Changed the build settings to support cross platform

.swift-version

@@ -1 +1 @@
-3.0
+3.0.1

.travis.yml

@@ -1,18 +1,33 @@
-language: objective-c
-osx_image: xcode8
-
 env:
   global:
     - LC_CTYPE=en_US.UTF-8
 
-install:
-
-script:
-  - set -o pipefail
-  - xcodebuild test -workspace Kanna.xcworkspace -scheme Kanna -configuration Release -destination 'platform=iOS Simulator,name=iPhone 6s' | xcpretty -c
-  - xcodebuild test -workspace Kanna.xcworkspace -scheme Kanna_OSX -configuration Release | xcpretty -c
-  - xcodebuild test -workspace Kanna.xcworkspace -scheme Kanna_tvOS -configuration Release -sdk appletvsimulator -destination "platform=tvOS Simulator,name=Apple TV 1080p" | xcpretty -c
-  - xcodebuild build -workspace Kanna.xcworkspace -scheme Kanna_watchOS -configuration Release -sdk watchsimulator -destination "platform=watchOS Simulator,name=Apple Watch - 38mm" | xcpretty -c
+matrix:
+  include:
+    - os: osx
+      language: objective-c
+      osx_image: xcode8.1
+      script:
+        - set -o pipefail
+        - xcodebuild build-for-testing test-without-building -scheme Kanna -configuration Release ENABLE_TESTABILITY=YES | xcpretty -c
+        - xcodebuild build-for-testing test-without-building -scheme Kanna -configuration Release -sdk iphonesimulator -destination "name=iPhone 6s" ENABLE_TESTABILITY=YES | xcpretty -c
+        - xcodebuild build-for-testing test-without-building -scheme Kanna -configuration Release -sdk appletvsimulator -destination "name=Apple TV 1080p" ENABLE_TESTABILITY=YES | xcpretty -c
+        - xcodebuild -scheme Kanna -configuration Release -sdk watchsimulator -destination "name=Apple Watch - 38mm"
+    - os: osx
+      language: generic
+      osx_image: xcode8.1
+      script:
+        - swift build
+        - swift test
+    - os: linux
+      language: generic
+      sudo: required
+      dist: trusty
+      before_install:
+        - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
+      script:
+        - swift build
+        - swift test
 
 notifications:
   email: false

Configurations/Base.xcconfig

@@ -0,0 +1,42 @@
+//
+//  Base.xcconfig
+//  Kanna
+//
+//  Created by Atsushi Kiwaki on 2016/12/05.
+//  Copyright © 2016 Atsushi Kiwaki. All rights reserved.
+//
+ALWAYS_SEARCH_USER_PATHS = NO
+CLANG_CXX_LANGUAGE_STANDARD = gnu++0x
+CLANG_CXX_LIBRARY = libc++
+CLANG_ENABLE_MODULES = YES
+CLANG_ENABLE_OBJC_ARC = YES
+CLANG_WARN__DUPLICATE_METHOD_MATCH = YES
+CLANG_WARN_BOOL_CONVERSION = YES
+CLANG_WARN_CONSTANT_CONVERSION = YES
+CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR
+CLANG_WARN_EMPTY_BODY = YES
+CLANG_WARN_ENUM_CONVERSION = YES
+CLANG_WARN_INT_CONVERSION = YES
+CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR
+CLANG_WARN_UNREACHABLE_CODE = YES
+CURRENT_PROJECT_VERSION = 1
+ENABLE_STRICT_OBJC_MSGSEND = YES
+GCC_C_LANGUAGE_STANDARD = gnu99
+GCC_WARN_64_TO_32_BIT_CONVERSION = YES
+GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR
+GCC_WARN_UNDECLARED_SELECTOR = YES
+GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE
+GCC_WARN_UNUSED_FUNCTION = YES
+GCC_WARN_UNUSED_VARIABLE = YES
+VERSION_INFO_PREFIX =
+VERSIONING_SYSTEM = apple-generic
+
+CODE_SIGNING_REQUIRED = NO
+CODE_SIGN_IDENTITY =
+MACOSX_DEPLOYMENT_TARGET = 10.9
+IPHONEOS_DEPLOYMENT_TARGET = 8.0
+WATCHOS_DEPLOYMENT_TARGET = 2.0
+TVOS_DEPLOYMENT_TARGET = 9.0
+
+HEADER_SEARCH_PATHS = $(SDKROOT)/usr/include/libxml2
+SWIFT_INCLUDE_PATHS = $(SRCROOT)/Modules

Configurations/Debug.xcconfig

@@ -0,0 +1,19 @@
+//
+//  Debug.xcconfig
+//  Kanna
+//
+//  Created by Atsushi Kiwaki on 2016/12/05.
+//  Copyright © 2016 Atsushi Kiwaki. All rights reserved.
+//
+#include "Base.xcconfig"
+
+BITCODE_GENERATION_MODE = marker
+MTL_ENABLE_DEBUG_INFO = YES
+COPY_PHASE_STRIP = NO
+ENABLE_TESTABILITY = YES
+GCC_OPTIMIZATION_LEVEL = 0
+GCC_DYNAMIC_NO_PIC = NO
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) DEBUG=1
+GCC_SYMBOLS_PRIVATE_EXTERN = NO
+ONLY_ACTIVE_ARCH = YES
+SWIFT_OPTIMIZATION_LEVEL = -Onone

Configurations/Kanna.xcconfig

@@ -0,0 +1,31 @@
+//
+//  Kanna.xcconfig
+//  Kanna
+//
+//  Created by Atsushi Kiwaki on 2016/12/05.
+//  Copyright © 2016 Atsushi Kiwaki. All rights reserved.
+//
+COMBINE_HIDPI_IMAGES = YES
+DEFINES_MODULE = YES
+DYLIB_COMPATIBILITY_VERSION = 1
+DYLIB_CURRENT_VERSION = 1
+DYLIB_INSTALL_NAME_BASE = @rpath
+FRAMEWORK_VERSION = A
+INFOPLIST_FILE = Sources/Kanna/Info.plist
+PRODUCT_BUNDLE_IDENTIFIER = com.tid.$(PRODUCT_NAME:rfc1034identifier)
+PRODUCT_NAME = $(PROJECT_NAME)
+SKIP_INSTALL = YES
+
+SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator watchos watchsimulator appletvos appletvsimulator
+TARGETED_DEVICE_FAMILY = 1,2,3,4
+
+ENABLE_BITCODE[sdk=iphone*] = YES;
+ENABLE_BITCODE[sdk=watch*] = YES;
+ENABLE_BITCODE[sdk=appletv*] = YES;
+
+LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks
+LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
+LD_RUNPATH_SEARCH_PATHS[sdk=watch*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
+LD_RUNPATH_SEARCH_PATHS[sdk=appletv*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
+
+APPLICATION_EXTENSION_API_ONLY = YES;

Configurations/Release.xcconfig

@@ -0,0 +1,15 @@
+//
+//  Release.xcconfig
+//  Kanna
+//
+//  Created by Atsushi Kiwaki on 2016/12/05.
+//  Copyright © 2016 Atsushi Kiwaki. All rights reserved.
+//
+#include "Base.xcconfig"
+
+COPY_PHASE_STRIP = YES
+ENABLE_NS_ASSERTIONS = NO
+MTL_ENABLE_DEBUG_INFO = NO
+VALIDATE_PRODUCT = YES
+DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
+BITCODE_GENERATION_MODE = bitcode

Configurations/Tests.xcconfig

@@ -0,0 +1,17 @@
+//
+//  Tests.xcconfig
+//  Kanna
+//
+//  Created by Atsushi Kiwaki on 2016/12/05.
+//  Copyright © 2016 Atsushi Kiwaki. All rights reserved.
+//
+COMBINE_HIDPI_IMAGES = YES
+INFOPLIST_FILE = Tests/KannaTests/Info.plist
+PRODUCT_BUNDLE_IDENTIFIER = com.tid.$(PRODUCT_NAME:rfc1034identifier)
+PRODUCT_NAME = $(PROJECT_NAME)Tests
+
+SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator appletvos appletvsimulator
+
+LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks
+LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
+LD_RUNPATH_SEARCH_PATHS[sdk=appletv*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks

Kanna.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = "Kanna"
-  s.version          = "2.0.0"
-  s.summary          = "Kanna is an XML/HTML parser for iOS/Mac OS X."
+  s.version          = "2.1.0"
+  s.summary          = "Kanna is an XML/HTML parser for iOS/macOS/watchOS/tvOS and Linux."
   s.homepage         = "https://github.com/tid-kijyun/Kanna"
   s.license          = 'MIT'
   s.author           = { "Atsushi Kiwaki" => "[email protected]" }
@@ -13,8 +13,11 @@ Pod::Spec.new do |s|
   s.tvos.deployment_target = "9.0"
   s.watchos.deployment_target = "2.0"
   s.requires_arc = true
-
+  s.preserve_path = 'Modules/*'
   s.source_files  = ['Sources/**/*.swift', 'Sources/**/*.h']
-  s.libraries     = 'xml2'
-  s.xcconfig      = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' }
+  s.xcconfig      = {
+                      'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2',
+                      'SWIFT_INCLUDE_PATHS' => '$(SRCROOT)/Kanna/Modules'
+                    }
 end
+