Skip to content

Commit

Permalink
Updated project setting for 1.4.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
bobgodwinx committed Oct 6, 2019
1 parent cd1726b commit d764a6d
Show file tree
Hide file tree
Showing 9 changed files with 129 additions and 61 deletions.
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "Quick/Nimble" "v8.0.1"
github "Quick/Quick" "v2.1.0"
github "Quick/Nimble" "v8.0.4"
github "Quick/Quick" "v2.2.0"
github "ReactiveX/RxSwift" "5.0.1"
2 changes: 1 addition & 1 deletion RxCoreLocation.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'RxCoreLocation'
s.version = '1.4.0'
s.version = '1.4.1'
s.license = { :type => "MIT", :file => "LICENSE" }
s.summary = 'RxCoreLocation abstract the Rx behavior for Core Location'
s.homepage = 'http://github.com/RxSwiftCommunity/RxCoreLocation'
Expand Down
8 changes: 5 additions & 3 deletions RxCoreLocation.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0800;
LastUpgradeCheck = 0940;
LastUpgradeCheck = 1100;
ORGANIZATIONNAME = RxCoreLocation;
TargetAttributes = {
3549BB201DA389CD00C63030 = {
Expand Down Expand Up @@ -448,11 +448,11 @@
};
buildConfigurationList = 3549BAFF1DA387DB00C63030 /* Build configuration list for PBXProject "RxCoreLocation" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
mainGroup = 3549BAFB1DA387DB00C63030;
productRefGroup = 3549BB061DA387DB00C63030 /* Products */;
Expand Down Expand Up @@ -589,6 +589,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 @@ -653,6 +654,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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1100"
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 = "3549BB201DA389CD00C63030"
BuildableName = "RxCoreLocation.framework"
BlueprintName = "RxCoreLocation-iOS"
ReferencedContainer = "container:RxCoreLocation.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -39,17 +48,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3549BB201DA389CD00C63030"
BuildableName = "RxCoreLocation.framework"
BlueprintName = "RxCoreLocation-iOS"
ReferencedContainer = "container:RxCoreLocation.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -70,8 +68,6 @@
ReferencedContainer = "container:RxCoreLocation.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 = "0940"
LastUpgradeVersion = "1100"
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 = "3549BB3A1DA389E800C63030"
BuildableName = "RxCoreLocation.framework"
BlueprintName = "RxCoreLocation-macOS"
ReferencedContainer = "container:RxCoreLocation.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -39,17 +48,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3549BB3A1DA389E800C63030"
BuildableName = "RxCoreLocation.framework"
BlueprintName = "RxCoreLocation-macOS"
ReferencedContainer = "container:RxCoreLocation.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -70,8 +68,6 @@
ReferencedContainer = "container:RxCoreLocation.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 = "0940"
LastUpgradeVersion = "1100"
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 = "3549BB471DA389F300C63030"
BuildableName = "RxCoreLocation.framework"
BlueprintName = "RxCoreLocation-tvOS"
ReferencedContainer = "container:RxCoreLocation.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -39,17 +48,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3549BB471DA389F300C63030"
BuildableName = "RxCoreLocation.framework"
BlueprintName = "RxCoreLocation-tvOS"
ReferencedContainer = "container:RxCoreLocation.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -70,8 +68,6 @@
ReferencedContainer = "container:RxCoreLocation.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 = "0940"
LastUpgradeVersion = "1100"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -29,8 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -51,8 +49,6 @@
ReferencedContainer = "container:RxCoreLocation.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1100"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C4A8A3E51FB5B4F600356A42"
BuildableName = "RxCoreLocationExample.app"
BlueprintName = "RxCoreLocationExample"
ReferencedContainer = "container:RxCoreLocationExample.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C4A8A3E51FB5B4F600356A42"
BuildableName = "RxCoreLocationExample.app"
BlueprintName = "RxCoreLocationExample"
ReferencedContainer = "container:RxCoreLocationExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<LocationScenarioReference
identifier = "../RxCoreLocationExample/berlin.gpx"
referenceType = "0">
</LocationScenarioReference>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C4A8A3E51FB5B4F600356A42"
BuildableName = "RxCoreLocationExample.app"
BlueprintName = "RxCoreLocationExample"
ReferencedContainer = "container:RxCoreLocationExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
16 changes: 8 additions & 8 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
paths:
- Carthage
- run:
name: Run Tests (Swift 4.0)
name: Run Tests (Swift 5.1)
command: >
set -o pipefail && xcodebuild test SWIFT_VERSION=4.0
set -o pipefail && xcodebuild test SWIFT_VERSION=5.1
-workspace RxCoreLocation.xcworkspace
-scheme 'RxCoreLocation-iOS' -sdk iphonesimulator
-destination "name=iPhone X" | xcpretty -c --test
Expand All @@ -40,9 +40,9 @@ jobs:
-scheme 'RxCoreLocation-iOS' -sdk iphonesimulator
-destination "name=iPhone X" | xcpretty -c --test
- run:
name: Build watchOS (Swift 4.0)
name: Build watchOS (Swift 5.1)
command: >
set -o pipefail && xcodebuild build SWIFT_VERSION=4.0
set -o pipefail && xcodebuild build SWIFT_VERSION=5.1
-workspace RxCoreLocation.xcworkspace
-scheme RxCoreLocation-watchOS -sdk watchsimulator
-destination "name=Apple Watch Series 2 - 42mm" | xcpretty -c
Expand All @@ -54,9 +54,9 @@ jobs:
-scheme RxCoreLocation-watchOS -sdk watchsimulator
-destination "name=Apple Watch Series 2 - 42mm" | xcpretty -c
- run:
name: Build macOS (Swift 4.0)
name: Build macOS (Swift 5.1)
command: >
set -o pipefail && xcodebuild build SWIFT_VERSION=4.0
set -o pipefail && xcodebuild build SWIFT_VERSION=5.1
-workspace RxCoreLocation.xcworkspace
-scheme RxCoreLocation-macOS -sdk macosx
-destination "arch=x86_64" | xcpretty -c
Expand All @@ -68,9 +68,9 @@ jobs:
-scheme RxCoreLocation-macOS -sdk macosx
-destination "arch=x86_64" | xcpretty -c
- run:
name: Build tvOS (Swift 4.0)
name: Build tvOS (Swift 5.1)
command: >
set -o pipefail && xcodebuild build SWIFT_VERSION=4.0
set -o pipefail && xcodebuild build SWIFT_VERSION=5.1
-workspace RxCoreLocation.xcworkspace
-scheme RxCoreLocation-tvOS -sdk appletvsimulator
-destination "name=Apple TV 4K (at 1080p)" | xcpretty -c
Expand Down

0 comments on commit d764a6d

Please sign in to comment.