Skip to content

Commit

Permalink
Updates for Swift 4.2 (#26)
Browse files Browse the repository at this point in the history
* Swift 4.2 fixes

* version 0.2.2

* fix example

* try fix travis build
  • Loading branch information
jangbl authored and antoninbiret committed Dec 31, 2018
1 parent 9715798 commit 9926785
Show file tree
Hide file tree
Showing 17 changed files with 303 additions and 251 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
language: objective-c
osx_image: xcode9
xcode_sdk: iphonesimulator11.0
osx_image: xcode10.1
xcode_sdk: iphonesimulator12.1

before_install:
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet

script:
- set -o pipefail && xcodebuild build -workspace Exemple-ABSteppedProgressBar/Exemple.xcworkspace -scheme Exemple -sdk iphonesimulator11.0 ONLY_ACTIVE_ARCH=NO | xcpretty
- set -o pipefail && xcodebuild build -workspace Exemple-ABSteppedProgressBar/Exemple.xcworkspace -scheme Exemple -sdk iphonesimulator12.1 ONLY_ACTIVE_ARCH=NO | xcpretty
2 changes: 1 addition & 1 deletion ABSteppedProgressBar.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Pod::Spec.new do |s|

s.name = 'ABSteppedProgressBar'

s.version = '0.2.1'
s.version = '0.2.2'

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

Expand Down
26 changes: 7 additions & 19 deletions Exemple-ABSteppedProgressBar/Exemple.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@
D23C1FAF1BDFFD1A00D44192 /* Frameworks */,
D23C1FB01BDFFD1A00D44192 /* Resources */,
25C5D1B67C5B9625960C59CD /* [CP] Embed Pods Frameworks */,
7E4E3E091109757BC2BCE44C /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -120,7 +119,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0710;
LastUpgradeCheck = 0900;
LastUpgradeCheck = 1010;
ORGANIZATIONNAME = antoninbiret;
TargetAttributes = {
D23C1FB11BDFFD1A00D44192 = {
Expand Down Expand Up @@ -179,21 +178,6 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Exemple/Pods-Exemple-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
7E4E3E091109757BC2BCE44C /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Exemple/Pods-Exemple-resources.sh\"\n";
showEnvVarsInLog = 0;
};
F2EC0A24A8FD8E6723B3FEDD /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -259,12 +243,14 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down Expand Up @@ -313,12 +299,14 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down Expand Up @@ -362,7 +350,7 @@
STRIP_INSTALLED_PRODUCT = NO;
STRIP_STYLE = debugging;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -380,7 +368,7 @@
STRIP_INSTALLED_PRODUCT = NO;
STRIP_STYLE = debugging;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = 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 = "0900"
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,7 +26,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
Expand All @@ -46,7 +45,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
2 changes: 1 addition & 1 deletion Exemple-ABSteppedProgressBar/Exemple/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
// Override point for customization after application launch.
return true
}
Expand Down
8 changes: 4 additions & 4 deletions Exemple-ABSteppedProgressBar/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
PODS:
- ABSteppedProgressBar (0.0.8)
- ABSteppedProgressBar (0.2.2)

DEPENDENCIES:
- ABSteppedProgressBar (from `../`)

EXTERNAL SOURCES:
ABSteppedProgressBar:
:path: ../
:path: "../"

SPEC CHECKSUMS:
ABSteppedProgressBar: c9f782ab93aba7777f7da0efb8164e73e816f226
ABSteppedProgressBar: 6a87cc6f804f2029ac3a7f60e0bc03260a799a34

PODFILE CHECKSUM: 9f34ce448a486bf215db79d2ce5332226e980332

COCOAPODS: 1.3.1
COCOAPODS: 1.5.3

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Exemple-ABSteppedProgressBar/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9926785

Please sign in to comment.