Skip to content

Commit

Permalink
Merge pull request #13 from hironytic/swift5.1
Browse files Browse the repository at this point in the history
Build against Swift 5.1 with Xcode 11.1
  • Loading branch information
hironytic authored Oct 12, 2019
2 parents a2a8bd4 + e6a891a commit b4ec841
Show file tree
Hide file tree
Showing 15 changed files with 54 additions and 59 deletions.
1 change: 0 additions & 1 deletion .swift-version

This file was deleted.

4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# * https://github.com/supermarin/xcpretty#usage

language: objective-c
osx_image: xcode10
osx_image: xcode11.1
# cache: cocoapods
# podfile: Example/Podfile
before_install:
- gem install cocoapods # Since Travis is not always on latest version
# - pod install --project-directory=Example
script:
- set -o pipefail && xcodebuild test -project XMLPullitic/XMLPullitic.xcodeproj -scheme XMLPullitic_iOS -destination 'platform=iOS Simulator,name=iPhone XR' ONLY_ACTIVE_ARCH=NO | xcpretty
- set -o pipefail && xcodebuild test -project XMLPullitic/XMLPullitic.xcodeproj -scheme XMLPullitic_iOS -destination 'platform=iOS Simulator,name=iPhone 11' ONLY_ACTIVE_ARCH=NO | xcpretty
- pod lib lint --allow-warnings
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2016 Hironori Ichimiya <[email protected]>
Copyright (c) 2016-2019 Hironori Ichimiya <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ default:

- iOS 8.0+
- tvOS 9.0+
- Swift 4.2+
- Swift 5.1+

## Installation

Expand All @@ -74,7 +74,7 @@ To install it, simply add the following lines to your Podfile:

```ruby
use_frameworks!
pod "XMLPullitic", '~> 2.0'
pod "XMLPullitic", '~> 3.0'
```

### Carthage
Expand All @@ -83,7 +83,7 @@ XMLPullitic is available through [Carthage](https://github.com/Carthage/Carthage
To install it, simply add the following line to your Cartfile:

```
github "hironytic/XMLPullitic" ~> 2.0
github "hironytic/XMLPullitic" ~> 3.0
```

## Author
Expand Down
2 changes: 1 addition & 1 deletion Sources/XMLElement.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// XMLElement.swift
// XMLPullitic
//
// Copyright (c) 2016,2017 Hironori Ichimiya <[email protected]>
// Copyright (c) 2016-2019 Hironori Ichimiya <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Sources/XMLEvent.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// XMLPullParserEvent.swift
// XMLPullitic
//
// Copyright (c) 2016,2017 Hironori Ichimiya <[email protected]>
// Copyright (c) 2016-2019 Hironori Ichimiya <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Sources/XMLPullParser.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// XMLPullParser.swift
// XMLPullitic
//
// Copyright (c) 2016,2017 Hironori Ichimiya <[email protected]>
// Copyright (c) 2016-2019 Hironori Ichimiya <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Sources/XMLPullParserError.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// XMLPullParserError.swift
// XMLPullitic
//
// Copyright (c) 2016,2017 Hironori Ichimiya <[email protected]>
// Copyright (c) 2016-2019 Hironori Ichimiya <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 2 additions & 1 deletion XMLPullitic.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = "XMLPullitic"
s.version = "2.0.0"
s.version = "3.0.0"
s.summary = "Swifty XML pull parser"

s.description = <<-DESC
Expand All @@ -24,6 +24,7 @@ Pod::Spec.new do |s|
# s.osx.deployment_target = "10.9"
# s.watchos.deployment_target = "2.0"
s.tvos.deployment_target = "9.0"
s.swift_versions = ['5.1']
s.requires_arc = true

s.source_files = 'Sources/**/*'
Expand Down
31 changes: 17 additions & 14 deletions XMLPullitic/XMLPullitic.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -245,35 +245,36 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0910;
LastUpgradeCheck = 0930;
LastUpgradeCheck = 1110;
ORGANIZATIONNAME = hironytic;
TargetAttributes = {
50285CCB1CD2C897008477E1 = {
CreatedOnToolsVersion = 7.3;
LastSwiftMigration = 0900;
LastSwiftMigration = 1110;
};
50285CD51CD2C897008477E1 = {
CreatedOnToolsVersion = 7.3;
LastSwiftMigration = 0900;
LastSwiftMigration = 1110;
};
509224A91FB9CC7C00C848EA = {
CreatedOnToolsVersion = 9.1;
LastSwiftMigration = 1000;
LastSwiftMigration = 1110;
ProvisioningStyle = Automatic;
};
509224B11FB9CC7C00C848EA = {
CreatedOnToolsVersion = 9.1;
LastSwiftMigration = 1000;
LastSwiftMigration = 1110;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = 50285CC61CD2C897008477E1 /* Build configuration list for PBXProject "XMLPullitic" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 50285CC21CD2C897008477E1;
productRefGroup = 50285CCD1CD2C897008477E1 /* Products */;
Expand Down Expand Up @@ -380,6 +381,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down Expand Up @@ -440,6 +442,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down Expand Up @@ -506,7 +509,7 @@
PRODUCT_NAME = XMLPullitic;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -525,7 +528,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.hironytic.XMLPullitic;
PRODUCT_NAME = XMLPullitic;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -536,7 +539,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.hironytic.XMLPulliticTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -547,7 +550,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.hironytic.XMLPulliticTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -573,7 +576,7 @@
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 3;
};
name = Debug;
Expand All @@ -599,7 +602,7 @@
PRODUCT_NAME = XMLPullitic;
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 3;
};
name = Release;
Expand All @@ -620,7 +623,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 11.1;
};
Expand All @@ -641,7 +644,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.hironytic.XMLPulliticTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 11.1;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1110"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,8 +26,17 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
codeCoverageEnabled = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "50285CCB1CD2C897008477E1"
BuildableName = "XMLPullitic.framework"
BlueprintName = "XMLPullitic_iOS"
ReferencedContainer = "container:XMLPullitic.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -40,17 +49,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "50285CCB1CD2C897008477E1"
BuildableName = "XMLPullitic.framework"
BlueprintName = "XMLPullitic_iOS"
ReferencedContainer = "container:XMLPullitic.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -71,8 +69,6 @@
ReferencedContainer = "container:XMLPullitic.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1110"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -27,6 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "509224A91FB9CC7C00C848EA"
BuildableName = "XMLPullitic.framework"
BlueprintName = "XMLPullitic_tvOS"
ReferencedContainer = "container:XMLPullitic.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -39,17 +48,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "509224A91FB9CC7C00C848EA"
BuildableName = "XMLPullitic.framework"
BlueprintName = "XMLPullitic_tvOS"
ReferencedContainer = "container:XMLPullitic.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -70,8 +68,6 @@
ReferencedContainer = "container:XMLPullitic.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
2 changes: 1 addition & 1 deletion XMLPullitic/XMLPullitic/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.0.0</string>
<string>3.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion XMLPullitic/XMLPullitic/XMLPullitic.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// XMLPullitic.h
// XMLPullitic
//
// Copyright (c) 2016,2017 Hironori Ichimiya <[email protected]>
// Copyright (c) 2016-2019 Hironori Ichimiya <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion XMLPullitic/XMLPulliticTests/XMLPulliticTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// XMLPulliticTests.swift
// XMLPulliticTests
//
// Copyright (c) 2016,2017 Hironori Ichimiya <[email protected]>
// Copyright (c) 2016-2019 Hironori Ichimiya <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down

0 comments on commit b4ec841

Please sign in to comment.