Skip to content

Commit 185e15b

Browse files
lucdionlucdion
committed
Update gems + pods + CI + xcode
1 parent a166915 commit 185e15b

File tree

9 files changed

+194
-135
lines changed

9 files changed

+194
-135
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode10.2
2+
osx_image: xcode12.5
33

44
addons:
55
homebrew:

‎Example/FlexLayoutSample.xcodeproj/project.pbxproj

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -474,10 +474,9 @@
474474
};
475475
buildConfigurationList = 249EFE3A1E64FAFE00165E39 /* Build configuration list for PBXProject "FlexLayoutSample" */;
476476
compatibilityVersion = "Xcode 3.2";
477-
developmentRegion = English;
477+
developmentRegion = en;
478478
hasScannedForEncodings = 0;
479479
knownRegions = (
480-
English,
481480
en,
482481
Base,
483482
);
@@ -543,12 +542,15 @@
543542
buildActionMask = 2147483647;
544543
files = (
545544
);
546-
inputFileListPaths = (
547-
"${PODS_ROOT}/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample-frameworks-${CONFIGURATION}-input-files.xcfilelist",
545+
inputPaths = (
546+
"${PODS_ROOT}/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample-frameworks.sh",
547+
"${BUILT_PRODUCTS_DIR}/FlexLayout/FlexLayout.framework",
548+
"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
548549
);
549550
name = "[CP] Embed Pods Frameworks";
550-
outputFileListPaths = (
551-
"${PODS_ROOT}/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample-frameworks-${CONFIGURATION}-output-files.xcfilelist",
551+
outputPaths = (
552+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FlexLayout.framework",
553+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PinLayout.framework",
552554
);
553555
runOnlyForDeploymentPostprocessing = 0;
554556
shellPath = /bin/sh;
@@ -718,14 +720,14 @@
718720
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
719721
GCC_WARN_UNUSED_FUNCTION = YES;
720722
GCC_WARN_UNUSED_VARIABLE = YES;
721-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
723+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
722724
MTL_ENABLE_DEBUG_INFO = YES;
723725
ONLY_ACTIVE_ARCH = YES;
724726
SDKROOT = iphoneos;
725727
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
726728
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
727729
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
728-
SWIFT_VERSION = 4.0;
730+
SWIFT_VERSION = 5.0;
729731
TARGETED_DEVICE_FAMILY = "1,2";
730732
};
731733
name = Debug;
@@ -773,13 +775,13 @@
773775
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
774776
GCC_WARN_UNUSED_FUNCTION = YES;
775777
GCC_WARN_UNUSED_VARIABLE = YES;
776-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
778+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
777779
MTL_ENABLE_DEBUG_INFO = NO;
778780
SDKROOT = iphoneos;
779781
SWIFT_COMPILATION_MODE = wholemodule;
780782
SWIFT_OPTIMIZATION_LEVEL = "-O";
781783
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
782-
SWIFT_VERSION = 4.0;
784+
SWIFT_VERSION = 5.0;
783785
TARGETED_DEVICE_FAMILY = "1,2";
784786
VALIDATE_PRODUCT = YES;
785787
};
@@ -799,7 +801,7 @@
799801
"FLEXLAYOUT_SWIFT_PACKAGE=1",
800802
);
801803
INFOPLIST_FILE = "FlexLayoutSample/Supporting Files/Info.plist";
802-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
804+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
803805
LD_RUNPATH_SEARCH_PATHS = (
804806
"$(inherited)",
805807
"@executable_path/Frameworks",
@@ -822,7 +824,7 @@
822824
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
823825
CODE_SIGN_STYLE = Automatic;
824826
INFOPLIST_FILE = "FlexLayoutSample/Supporting Files/Info.plist";
825-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
827+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
826828
LD_RUNPATH_SEARCH_PATHS = (
827829
"$(inherited)",
828830
"@executable_path/Frameworks",
@@ -842,6 +844,7 @@
842844
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
843845
GCC_INPUT_FILETYPE = automatic;
844846
INFOPLIST_FILE = "FlexLayoutSample/Supporting Files/Info.plist";
847+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
845848
PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutSample;
846849
PRODUCT_NAME = "$(TARGET_NAME)";
847850
SWIFT_VERSION = 5.0;
@@ -855,6 +858,7 @@
855858
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
856859
GCC_INPUT_FILETYPE = automatic;
857860
INFOPLIST_FILE = "FlexLayoutSample/Supporting Files/Info.plist";
861+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
858862
PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutSample;
859863
PRODUCT_NAME = "$(TARGET_NAME)";
860864
SWIFT_VERSION = 5.0;

‎Example/FlexLayoutSample/UI/Menu/MenuView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import UIKit
1414

15-
protocol MenuViewDelegate: class {
15+
protocol MenuViewDelegate: AnyObject {
1616
func didSelect(pageType: PageType)
1717
}
1818

‎Example/FlexLayoutSample/UI/Menu/MenuViewController.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ enum PageType: Int {
2424
case yogaExampleD
2525
case yogaExampleE
2626
case yogaExampleF
27-
//case flex
27+
// case flex
2828

2929
case count
3030

@@ -41,7 +41,7 @@ enum PageType: Int {
4141
case .yogaExampleD: return "Yoga C# Example"
4242
case .yogaExampleE: return "Yoga Android Example"
4343
case .yogaExampleF: return "Yoga Baseline Example"
44-
//case .flex: return "Flexbox"
44+
// case .flex: return "Flexbox"
4545
case .count: return ""
4646
}
4747
}
@@ -59,7 +59,7 @@ enum PageType: Int {
5959
case .yogaExampleD: return YogaExampleDViewController(pageType: self)
6060
case .yogaExampleE: return YogaExampleEViewController(pageType: self)
6161
case .yogaExampleF: return YogaExampleFViewController(pageType: self)
62-
//case .flex: return FlexboxViewController(pageType: self)
62+
// case .flex: return FlexboxViewController(pageType: self)
6363
case .count: return UIViewController()
6464
}
6565
}

‎FlexLayout.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

22
Pod::Spec.new do |spec|
33
spec.name = "FlexLayout"
4-
spec.version = "1.3.20"
4+
spec.version = "1.3.21"
55
spec.summary = "FlexLayout"
66
spec.homepage = "https://github.com/lucdion/FlexLayout.git"
77
spec.license = "MIT license"
88
spec.author = { "Luc Dion" => "[email protected]" }
99

10-
spec.platform = :ios, "8.0"
10+
spec.platform = :ios, "9.0"
1111
spec.source = { :git => "https://github.com/lucdion/FlexLayout.git", :tag => "#{spec.version}" }
1212
spec.source_files = "Sources/**/*.{swift,h,m,mm,cpp,c}"
1313
spec.public_header_files = "Sources/yoga/include/yoga/*.h", "Sources/YogaKit/include/YogaKit/*.h"

‎FlexLayout.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -558,14 +558,14 @@
558558
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
559559
GCC_WARN_UNUSED_FUNCTION = YES;
560560
GCC_WARN_UNUSED_VARIABLE = YES;
561-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
561+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
562562
MTL_ENABLE_DEBUG_INFO = YES;
563563
ONLY_ACTIVE_ARCH = YES;
564564
SDKROOT = iphoneos;
565565
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG XCODE_PROJECT_BUILD";
566566
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
567567
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
568-
SWIFT_VERSION = 4.0;
568+
SWIFT_VERSION = 5.0;
569569
TARGETED_DEVICE_FAMILY = "1,2";
570570
VERSIONING_SYSTEM = "apple-generic";
571571
VERSION_INFO_PREFIX = "";
@@ -619,13 +619,13 @@
619619
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
620620
GCC_WARN_UNUSED_FUNCTION = YES;
621621
GCC_WARN_UNUSED_VARIABLE = YES;
622-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
622+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
623623
MTL_ENABLE_DEBUG_INFO = NO;
624624
SDKROOT = iphoneos;
625625
SWIFT_ACTIVE_COMPILATION_CONDITIONS = XCODE_PROJECT_BUILD;
626626
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
627627
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
628-
SWIFT_VERSION = 4.0;
628+
SWIFT_VERSION = 5.0;
629629
TARGETED_DEVICE_FAMILY = "1,2";
630630
VALIDATE_PRODUCT = YES;
631631
VERSIONING_SYSTEM = "apple-generic";

0 commit comments

Comments
 (0)