Skip to content
Permalink
Browse files

Swift 5 migration (#48)

* updated project settings etc. to Xcode 10.2 and executed Swift 5 migration (no changes needed)

* removed deprecated .swift-version file and instead added Swift version to podspec, I also suggest a new version for the pod with this :)

* bumped CI config to the xcode 10.2 beta image (travis doesn't have a final one yet)

* updating the used iphonesdk for travis (I am guessing here as I don't know what's in the beta image...)

* that's what you get when you've not used travis for quite some time... :/
  • Loading branch information
GeroHerkenrath authored and LFabien committed Apr 2, 2019
1 parent 447cf56 commit 4fe264af51e0dd7228486c604750909e368241a7

This file was deleted.

@@ -1,16 +1,16 @@
language: objective-c
osx_image: xcode9
osx_image: xcode10.2
env:
global:
- LC_CTYPE=en_US.UTF-8
- LANG=en_US.UTF-8
- WORKSPACE=Ambassador.xcworkspace
- IOS_FRAMEWORK_SCHEME="Ambassador-iOS"
- IOS_SDK=iphonesimulator11.0
- IOS_SDK=iphonesimulator12.2
- MACOS_FRAMEWORK_SCHEME="Ambassador-macOS"
- MACOS_SDK=macosx10.13
- MACOS_SDK=macosx10.14
matrix:
- DESTINATION="OS=11.0,name=iPhone 6S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK"
- DESTINATION="OS=12.2,name=iPhone 6S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK"
- DESTINATION="arch=x86_64" SCHEME="$MACOS_FRAMEWORK_SCHEME" SDK="$MACOS_SDK"

before_install:
@@ -407,33 +407,39 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0810;
LastUpgradeCheck = 0900;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = "Fang-Pen Lin";
TargetAttributes = {
39C34062214C442900E11D82 = {
LastSwiftMigration = 1020;
};
AA6732941DE93849003ABD4E = {
CreatedOnToolsVersion = 8.1;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
AA67329C1DE93849003ABD4E = {
CreatedOnToolsVersion = 8.1;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
D8346A491D0B5FB200717A7D = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0800;
LastSwiftMigration = 1020;
};
D8346A531D0B5FB300717A7D = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0800;
LastSwiftMigration = 1020;
};
};
};
buildConfigurationList = D8346A441D0B5FB200717A7D /* Build configuration list for PBXProject "Ambassador" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = D8346A401D0B5FB200717A7D;
productRefGroup = D8346A4B1D0B5FB200717A7D /* Products */;
@@ -626,6 +632,7 @@
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 11.0;
};
@@ -652,6 +659,7 @@
PRODUCT_NAME = Ambassador;
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 11.0;
};
@@ -702,6 +710,7 @@
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
@@ -725,6 +734,7 @@
PRODUCT_NAME = Ambassador;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
};
name = Release;
};
@@ -743,6 +753,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
@@ -760,6 +771,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.envoy.Ambassador-macOSTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SWIFT_VERSION = 5.0;
};
name = Release;
};
@@ -776,12 +788,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;
@@ -835,12 +849,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;
@@ -895,6 +911,7 @@
PRODUCT_NAME = Ambassador;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
name = Debug;
};
@@ -917,6 +934,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.envoy.Ambassador;
PRODUCT_NAME = Ambassador;
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
};
name = Release;
};
@@ -927,6 +945,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.envoy.Ambassador-iOSTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
};
name = Debug;
};
@@ -937,6 +956,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.envoy.Ambassador-iOSTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
};
name = Release;
};
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0900"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0900"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
@@ -56,7 +55,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'EnvoyAmbassador'
spec.version = '4.0.5'
spec.version = '4.1.0'
spec.summary = 'Lightweight web framework in Swift based on SWSGI'
spec.homepage = 'https://github.com/envoy/Ambassador'
spec.license = 'MIT'
@@ -10,6 +10,7 @@ Pod::Spec.new do |spec|
spec.ios.deployment_target = '8.0'
spec.osx.deployment_target = '10.10'
spec.tvos.deployment_target = '11.0'
spec.swift_version = '5.0'
spec.source = {
git: 'https://github.com/envoy/Ambassador.git',
tag: "v#{spec.version}"

0 comments on commit 4fe264a

Please sign in to comment.
You can’t perform that action at this time.