Skip to content

Commit 9926785

Browse files
jangblantoninbiret
authored andcommitted
Updates for Swift 4.2 (#26)
* Swift 4.2 fixes * version 0.2.2 * fix example * try fix travis build
1 parent 9715798 commit 9926785

File tree

17 files changed

+303
-251
lines changed

17 files changed

+303
-251
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
language: objective-c
2-
osx_image: xcode9
3-
xcode_sdk: iphonesimulator11.0
2+
osx_image: xcode10.1
3+
xcode_sdk: iphonesimulator12.1
44

55
before_install:
66
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
77

88
script:
9-
- set -o pipefail && xcodebuild build -workspace Exemple-ABSteppedProgressBar/Exemple.xcworkspace -scheme Exemple -sdk iphonesimulator11.0 ONLY_ACTIVE_ARCH=NO | xcpretty
9+
- set -o pipefail && xcodebuild build -workspace Exemple-ABSteppedProgressBar/Exemple.xcworkspace -scheme Exemple -sdk iphonesimulator12.1 ONLY_ACTIVE_ARCH=NO | xcpretty

ABSteppedProgressBar.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
22

33
s.name = 'ABSteppedProgressBar'
44

5-
s.version = '0.2.1'
5+
s.version = '0.2.2'
66

77
s.summary = 'Simple and customisable stepped progress bar for iOS written in Swift'
88

Exemple-ABSteppedProgressBar/Exemple.xcodeproj/project.pbxproj

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
D23C1FAF1BDFFD1A00D44192 /* Frameworks */,
103103
D23C1FB01BDFFD1A00D44192 /* Resources */,
104104
25C5D1B67C5B9625960C59CD /* [CP] Embed Pods Frameworks */,
105-
7E4E3E091109757BC2BCE44C /* [CP] Copy Pods Resources */,
106105
);
107106
buildRules = (
108107
);
@@ -120,7 +119,7 @@
120119
isa = PBXProject;
121120
attributes = {
122121
LastSwiftUpdateCheck = 0710;
123-
LastUpgradeCheck = 0900;
122+
LastUpgradeCheck = 1010;
124123
ORGANIZATIONNAME = antoninbiret;
125124
TargetAttributes = {
126125
D23C1FB11BDFFD1A00D44192 = {
@@ -179,21 +178,6 @@
179178
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Exemple/Pods-Exemple-frameworks.sh\"\n";
180179
showEnvVarsInLog = 0;
181180
};
182-
7E4E3E091109757BC2BCE44C /* [CP] Copy Pods Resources */ = {
183-
isa = PBXShellScriptBuildPhase;
184-
buildActionMask = 2147483647;
185-
files = (
186-
);
187-
inputPaths = (
188-
);
189-
name = "[CP] Copy Pods Resources";
190-
outputPaths = (
191-
);
192-
runOnlyForDeploymentPostprocessing = 0;
193-
shellPath = /bin/sh;
194-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Exemple/Pods-Exemple-resources.sh\"\n";
195-
showEnvVarsInLog = 0;
196-
};
197181
F2EC0A24A8FD8E6723B3FEDD /* [CP] Check Pods Manifest.lock */ = {
198182
isa = PBXShellScriptBuildPhase;
199183
buildActionMask = 2147483647;
@@ -259,12 +243,14 @@
259243
CLANG_WARN_BOOL_CONVERSION = YES;
260244
CLANG_WARN_COMMA = YES;
261245
CLANG_WARN_CONSTANT_CONVERSION = YES;
246+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
262247
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
263248
CLANG_WARN_EMPTY_BODY = YES;
264249
CLANG_WARN_ENUM_CONVERSION = YES;
265250
CLANG_WARN_INFINITE_RECURSION = YES;
266251
CLANG_WARN_INT_CONVERSION = YES;
267252
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
253+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
268254
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
269255
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
270256
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -313,12 +299,14 @@
313299
CLANG_WARN_BOOL_CONVERSION = YES;
314300
CLANG_WARN_COMMA = YES;
315301
CLANG_WARN_CONSTANT_CONVERSION = YES;
302+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
316303
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
317304
CLANG_WARN_EMPTY_BODY = YES;
318305
CLANG_WARN_ENUM_CONVERSION = YES;
319306
CLANG_WARN_INFINITE_RECURSION = YES;
320307
CLANG_WARN_INT_CONVERSION = YES;
321308
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
309+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
322310
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
323311
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
324312
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -362,7 +350,7 @@
362350
STRIP_INSTALLED_PRODUCT = NO;
363351
STRIP_STYLE = debugging;
364352
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
365-
SWIFT_VERSION = 4.0;
353+
SWIFT_VERSION = 4.2;
366354
};
367355
name = Debug;
368356
};
@@ -380,7 +368,7 @@
380368
STRIP_INSTALLED_PRODUCT = NO;
381369
STRIP_STYLE = debugging;
382370
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
383-
SWIFT_VERSION = 4.0;
371+
SWIFT_VERSION = 4.2;
384372
};
385373
name = Release;
386374
};

Exemple-ABSteppedProgressBar/Exemple.xcodeproj/xcshareddata/xcschemes/Exemple.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
@@ -46,7 +45,6 @@
4645
buildConfiguration = "Debug"
4746
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4847
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49-
language = ""
5048
launchStyle = "0"
5149
useCustomWorkingDirectory = "NO"
5250
ignoresPersistentStateOnLaunch = "NO"

Exemple-ABSteppedProgressBar/Exemple/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1414
var window: UIWindow?
1515

1616

17-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
17+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
1818
// Override point for customization after application launch.
1919
return true
2020
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
PODS:
2-
- ABSteppedProgressBar (0.0.8)
2+
- ABSteppedProgressBar (0.2.2)
33

44
DEPENDENCIES:
55
- ABSteppedProgressBar (from `../`)
66

77
EXTERNAL SOURCES:
88
ABSteppedProgressBar:
9-
:path: ../
9+
:path: "../"
1010

1111
SPEC CHECKSUMS:
12-
ABSteppedProgressBar: c9f782ab93aba7777f7da0efb8164e73e816f226
12+
ABSteppedProgressBar: 6a87cc6f804f2029ac3a7f60e0bc03260a799a34
1313

1414
PODFILE CHECKSUM: 9f34ce448a486bf215db79d2ce5332226e980332
1515

16-
COCOAPODS: 1.3.1
16+
COCOAPODS: 1.5.3

Exemple-ABSteppedProgressBar/Pods/Local Podspecs/ABSteppedProgressBar.podspec.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Exemple-ABSteppedProgressBar/Pods/Manifest.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)