Skip to content

Commit 231036c

Browse files
committed
Swift 5
1 parent 1f2ffb5 commit 231036c

File tree

5 files changed

+25
-19
lines changed

5 files changed

+25
-19
lines changed

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2
1+
5.0

StyledInfoDemo/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.1.1</string>
18+
<string>$(MARKETING_VERSION)</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
<key>LSRequiresIPhoneOS</key>

StyledInformationView.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Pod::Spec.new do |s|
22
s.name = 'StyledInformationView'
3-
s.version = '2.1.1'
3+
s.version = '5.0'
44
s.license = 'MIT'
55
s.summary = 'StyledInformationView is a UIView for displaying a header, a menu and a detailed description.'
66
s.homepage = 'https://github.com/mjrehder/StyledInformationView.git'
77
s.authors = { 'Martin Jacob Rehder' => 'gitrepocon01@rehsco.com' }
88
s.source = { :git => 'https://github.com/mjrehder/StyledInformationView.git', :tag => s.version }
9-
s.swift_version = '4.2'
9+
s.swift_version = '5.0'
1010
s.ios.deployment_target = '10.0'
1111

1212
s.dependency 'MJRFlexStyleComponents'

StyledInformationView.xcodeproj/project.pbxproj

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -200,24 +200,24 @@
200200
isa = PBXProject;
201201
attributes = {
202202
LastSwiftUpdateCheck = 0810;
203-
LastUpgradeCheck = 1010;
203+
LastUpgradeCheck = 1140;
204204
ORGANIZATIONNAME = "Martin Jacob Rehder";
205205
TargetAttributes = {
206206
5B2839771DFD7A960028D107 = {
207207
CreatedOnToolsVersion = 8.1;
208-
LastSwiftMigration = 1010;
208+
LastSwiftMigration = 1140;
209209
ProvisioningStyle = Automatic;
210210
};
211211
5B2839861DFD7C380028D107 = {
212212
CreatedOnToolsVersion = 8.1;
213-
LastSwiftMigration = 1010;
213+
LastSwiftMigration = 1140;
214214
ProvisioningStyle = Automatic;
215215
};
216216
};
217217
};
218218
buildConfigurationList = 5B2839721DFD7A960028D107 /* Build configuration list for PBXProject "StyledInformationView" */;
219219
compatibilityVersion = "Xcode 3.2";
220-
developmentRegion = English;
220+
developmentRegion = en;
221221
hasScannedForEncodings = 0;
222222
knownRegions = (
223223
en,
@@ -298,14 +298,12 @@
298298
);
299299
inputPaths = (
300300
"${PODS_ROOT}/Target Support Files/Pods-StyledInfoDemo/Pods-StyledInfoDemo-frameworks.sh",
301-
"${BUILT_PRODUCTS_DIR}/DynamicColor/DynamicColor.framework",
302301
"${BUILT_PRODUCTS_DIR}/MJRFlexStyleComponents/MJRFlexStyleComponents.framework",
303302
"${BUILT_PRODUCTS_DIR}/StyledLabel/StyledLabel.framework",
304303
"${BUILT_PRODUCTS_DIR}/StyledOverlay/StyledOverlay.framework",
305304
);
306305
name = "[CP] Embed Pods Frameworks";
307306
outputPaths = (
308-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DynamicColor.framework",
309307
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRFlexStyleComponents.framework",
310308
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StyledLabel.framework",
311309
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StyledOverlay.framework",
@@ -363,6 +361,7 @@
363361
isa = XCBuildConfiguration;
364362
buildSettings = {
365363
ALWAYS_SEARCH_USER_PATHS = NO;
364+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
366365
CLANG_ANALYZER_NONNULL = YES;
367366
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
368367
CLANG_CXX_LIBRARY = "libc++";
@@ -415,6 +414,7 @@
415414
SDKROOT = iphoneos;
416415
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
417416
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
417+
SWIFT_VERSION = 5.0;
418418
TARGETED_DEVICE_FAMILY = "1,2";
419419
VERSIONING_SYSTEM = "apple-generic";
420420
VERSION_INFO_PREFIX = "";
@@ -425,6 +425,7 @@
425425
isa = XCBuildConfiguration;
426426
buildSettings = {
427427
ALWAYS_SEARCH_USER_PATHS = NO;
428+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
428429
CLANG_ANALYZER_NONNULL = YES;
429430
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
430431
CLANG_CXX_LIBRARY = "libc++";
@@ -469,6 +470,7 @@
469470
MTL_ENABLE_DEBUG_INFO = NO;
470471
SDKROOT = iphoneos;
471472
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
473+
SWIFT_VERSION = 5.0;
472474
TARGETED_DEVICE_FAMILY = "1,2";
473475
VALIDATE_PRODUCT = YES;
474476
VERSIONING_SYSTEM = "apple-generic";
@@ -489,12 +491,13 @@
489491
INFOPLIST_FILE = StyledInformationView/Info.plist;
490492
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
491493
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
494+
MARKETING_VERSION = 5.0;
492495
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.StyledInformationView;
493496
PRODUCT_NAME = "$(TARGET_NAME)";
494497
SKIP_INSTALL = YES;
495498
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
496-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
497-
SWIFT_VERSION = 4.2;
499+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
500+
SWIFT_VERSION = 5.0;
498501
};
499502
name = Debug;
500503
};
@@ -511,11 +514,12 @@
511514
INFOPLIST_FILE = StyledInformationView/Info.plist;
512515
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
513516
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
517+
MARKETING_VERSION = 5.0;
514518
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.StyledInformationView;
515519
PRODUCT_NAME = "$(TARGET_NAME)";
516520
SKIP_INSTALL = YES;
517-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
518-
SWIFT_VERSION = 4.2;
521+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
522+
SWIFT_VERSION = 5.0;
519523
};
520524
name = Release;
521525
};
@@ -527,10 +531,11 @@
527531
INFOPLIST_FILE = StyledInfoDemo/Info.plist;
528532
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
529533
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
534+
MARKETING_VERSION = 5.0;
530535
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.StyledInfoDemo;
531536
PRODUCT_NAME = "$(TARGET_NAME)";
532-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
533-
SWIFT_VERSION = 4.2;
537+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
538+
SWIFT_VERSION = 5.0;
534539
};
535540
name = Debug;
536541
};
@@ -542,10 +547,11 @@
542547
INFOPLIST_FILE = StyledInfoDemo/Info.plist;
543548
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
544549
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
550+
MARKETING_VERSION = 5.0;
545551
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.StyledInfoDemo;
546552
PRODUCT_NAME = "$(TARGET_NAME)";
547-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
548-
SWIFT_VERSION = 4.2;
553+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
554+
SWIFT_VERSION = 5.0;
549555
};
550556
name = Release;
551557
};

StyledInformationView/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.1.1</string>
18+
<string>$(MARKETING_VERSION)</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSPrincipalClass</key>

0 commit comments

Comments
 (0)