Skip to content

Commit d764a6d

Browse files
bobgodwinxbobgodwinx
committed
Updated project setting for 1.4.1 release
1 parent cd1726b commit d764a6d

File tree

9 files changed

+129
-61
lines changed

9 files changed

+129
-61
lines changed

‎Cartfile.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "Quick/Nimble" "v8.0.1"
2-
github "Quick/Quick" "v2.1.0"
1+
github "Quick/Nimble" "v8.0.4"
2+
github "Quick/Quick" "v2.2.0"
33
github "ReactiveX/RxSwift" "5.0.1"

‎RxCoreLocation.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'RxCoreLocation'
3-
s.version = '1.4.0'
3+
s.version = '1.4.1'
44
s.license = { :type => "MIT", :file => "LICENSE" }
55
s.summary = 'RxCoreLocation abstract the Rx behavior for Core Location'
66
s.homepage = 'http://github.com/RxSwiftCommunity/RxCoreLocation'

‎RxCoreLocation.xcodeproj/project.pbxproj

+5-3
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@
416416
isa = PBXProject;
417417
attributes = {
418418
LastSwiftUpdateCheck = 0800;
419-
LastUpgradeCheck = 0940;
419+
LastUpgradeCheck = 1100;
420420
ORGANIZATIONNAME = RxCoreLocation;
421421
TargetAttributes = {
422422
3549BB201DA389CD00C63030 = {
@@ -448,11 +448,11 @@
448448
};
449449
buildConfigurationList = 3549BAFF1DA387DB00C63030 /* Build configuration list for PBXProject "RxCoreLocation" */;
450450
compatibilityVersion = "Xcode 3.2";
451-
developmentRegion = English;
451+
developmentRegion = en;
452452
hasScannedForEncodings = 0;
453453
knownRegions = (
454-
English,
455454
en,
455+
Base,
456456
);
457457
mainGroup = 3549BAFB1DA387DB00C63030;
458458
productRefGroup = 3549BB061DA387DB00C63030 /* Products */;
@@ -589,6 +589,7 @@
589589
isa = XCBuildConfiguration;
590590
buildSettings = {
591591
ALWAYS_SEARCH_USER_PATHS = NO;
592+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
592593
CLANG_ANALYZER_NONNULL = YES;
593594
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
594595
CLANG_CXX_LIBRARY = "libc++";
@@ -653,6 +654,7 @@
653654
isa = XCBuildConfiguration;
654655
buildSettings = {
655656
ALWAYS_SEARCH_USER_PATHS = NO;
657+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
656658
CLANG_ANALYZER_NONNULL = YES;
657659
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
658660
CLANG_CXX_LIBRARY = "libc++";

‎RxCoreLocation.xcodeproj/xcshareddata/xcschemes/RxCoreLocation-iOS.xcscheme

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0940"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "3549BB201DA389CD00C63030"
34+
BuildableName = "RxCoreLocation.framework"
35+
BlueprintName = "RxCoreLocation-iOS"
36+
ReferencedContainer = "container:RxCoreLocation.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "3549BB201DA389CD00C63030"
46-
BuildableName = "RxCoreLocation.framework"
47-
BlueprintName = "RxCoreLocation-iOS"
48-
ReferencedContainer = "container:RxCoreLocation.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:RxCoreLocation.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

‎RxCoreLocation.xcodeproj/xcshareddata/xcschemes/RxCoreLocation-macOS.xcscheme

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0940"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "3549BB3A1DA389E800C63030"
34+
BuildableName = "RxCoreLocation.framework"
35+
BlueprintName = "RxCoreLocation-macOS"
36+
ReferencedContainer = "container:RxCoreLocation.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "3549BB3A1DA389E800C63030"
46-
BuildableName = "RxCoreLocation.framework"
47-
BlueprintName = "RxCoreLocation-macOS"
48-
ReferencedContainer = "container:RxCoreLocation.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:RxCoreLocation.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

‎RxCoreLocation.xcodeproj/xcshareddata/xcschemes/RxCoreLocation-tvOS.xcscheme

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0940"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "3549BB471DA389F300C63030"
34+
BuildableName = "RxCoreLocation.framework"
35+
BlueprintName = "RxCoreLocation-tvOS"
36+
ReferencedContainer = "container:RxCoreLocation.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "3549BB471DA389F300C63030"
46-
BuildableName = "RxCoreLocation.framework"
47-
BlueprintName = "RxCoreLocation-tvOS"
48-
ReferencedContainer = "container:RxCoreLocation.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:RxCoreLocation.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

‎RxCoreLocation.xcodeproj/xcshareddata/xcschemes/RxCoreLocation-watchOS.xcscheme

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0940"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
</Testables>
32-
<AdditionalOptions>
33-
</AdditionalOptions>
3432
</TestAction>
3533
<LaunchAction
3634
buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
5149
ReferencedContainer = "container:RxCoreLocation.xcodeproj">
5250
</BuildableReference>
5351
</MacroExpansion>
54-
<AdditionalOptions>
55-
</AdditionalOptions>
5652
</LaunchAction>
5753
<ProfileAction
5854
buildConfiguration = "Release"

‎RxCoreLocationExample.xcodeproj/xcshareddata/xcschemes/RxCoreLocationExample.xcscheme

+82
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1100"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "C4A8A3E51FB5B4F600356A42"
18+
BuildableName = "RxCoreLocationExample.app"
19+
BlueprintName = "RxCoreLocationExample"
20+
ReferencedContainer = "container:RxCoreLocationExample.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
<BuildableProductRunnable
44+
runnableDebuggingMode = "0">
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "C4A8A3E51FB5B4F600356A42"
48+
BuildableName = "RxCoreLocationExample.app"
49+
BlueprintName = "RxCoreLocationExample"
50+
ReferencedContainer = "container:RxCoreLocationExample.xcodeproj">
51+
</BuildableReference>
52+
</BuildableProductRunnable>
53+
<LocationScenarioReference
54+
identifier = "../RxCoreLocationExample/berlin.gpx"
55+
referenceType = "0">
56+
</LocationScenarioReference>
57+
</LaunchAction>
58+
<ProfileAction
59+
buildConfiguration = "Release"
60+
shouldUseLaunchSchemeArgsEnv = "YES"
61+
savedToolIdentifier = ""
62+
useCustomWorkingDirectory = "NO"
63+
debugDocumentVersioning = "YES">
64+
<BuildableProductRunnable
65+
runnableDebuggingMode = "0">
66+
<BuildableReference
67+
BuildableIdentifier = "primary"
68+
BlueprintIdentifier = "C4A8A3E51FB5B4F600356A42"
69+
BuildableName = "RxCoreLocationExample.app"
70+
BlueprintName = "RxCoreLocationExample"
71+
ReferencedContainer = "container:RxCoreLocationExample.xcodeproj">
72+
</BuildableReference>
73+
</BuildableProductRunnable>
74+
</ProfileAction>
75+
<AnalyzeAction
76+
buildConfiguration = "Debug">
77+
</AnalyzeAction>
78+
<ArchiveAction
79+
buildConfiguration = "Release"
80+
revealArchiveInOrganizer = "YES">
81+
</ArchiveAction>
82+
</Scheme>

‎circle.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626
paths:
2727
- Carthage
2828
- run:
29-
name: Run Tests (Swift 4.0)
29+
name: Run Tests (Swift 5.1)
3030
command: >
31-
set -o pipefail && xcodebuild test SWIFT_VERSION=4.0
31+
set -o pipefail && xcodebuild test SWIFT_VERSION=5.1
3232
-workspace RxCoreLocation.xcworkspace
3333
-scheme 'RxCoreLocation-iOS' -sdk iphonesimulator
3434
-destination "name=iPhone X" | xcpretty -c --test
@@ -40,9 +40,9 @@ jobs:
4040
-scheme 'RxCoreLocation-iOS' -sdk iphonesimulator
4141
-destination "name=iPhone X" | xcpretty -c --test
4242
- run:
43-
name: Build watchOS (Swift 4.0)
43+
name: Build watchOS (Swift 5.1)
4444
command: >
45-
set -o pipefail && xcodebuild build SWIFT_VERSION=4.0
45+
set -o pipefail && xcodebuild build SWIFT_VERSION=5.1
4646
-workspace RxCoreLocation.xcworkspace
4747
-scheme RxCoreLocation-watchOS -sdk watchsimulator
4848
-destination "name=Apple Watch Series 2 - 42mm" | xcpretty -c
@@ -54,9 +54,9 @@ jobs:
5454
-scheme RxCoreLocation-watchOS -sdk watchsimulator
5555
-destination "name=Apple Watch Series 2 - 42mm" | xcpretty -c
5656
- run:
57-
name: Build macOS (Swift 4.0)
57+
name: Build macOS (Swift 5.1)
5858
command: >
59-
set -o pipefail && xcodebuild build SWIFT_VERSION=4.0
59+
set -o pipefail && xcodebuild build SWIFT_VERSION=5.1
6060
-workspace RxCoreLocation.xcworkspace
6161
-scheme RxCoreLocation-macOS -sdk macosx
6262
-destination "arch=x86_64" | xcpretty -c
@@ -68,9 +68,9 @@ jobs:
6868
-scheme RxCoreLocation-macOS -sdk macosx
6969
-destination "arch=x86_64" | xcpretty -c
7070
- run:
71-
name: Build tvOS (Swift 4.0)
71+
name: Build tvOS (Swift 5.1)
7272
command: >
73-
set -o pipefail && xcodebuild build SWIFT_VERSION=4.0
73+
set -o pipefail && xcodebuild build SWIFT_VERSION=5.1
7474
-workspace RxCoreLocation.xcworkspace
7575
-scheme RxCoreLocation-tvOS -sdk appletvsimulator
7676
-destination "name=Apple TV 4K (at 1080p)" | xcpretty -c

0 commit comments

Comments
 (0)