Skip to content

Commit e9fd3c4

Browse files
marmelroyspotifymarmelroyspotify
committed
Localize Swift: update for xcode 12
1 parent 607e0c4 commit e9fd3c4

File tree

14 files changed

+33
-294
lines changed

14 files changed

+33
-294
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
osx_image: xcode10.3
1+
osx_image: xcode12
22
language: swift
33
env:
44
global:

‎Gemfile‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Gemfile.lock‎

Lines changed: 0 additions & 159 deletions
This file was deleted.

‎Localize-Swift.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ Pod::Spec.new do |s|
1212
s.source = { :git => "https://github.com/marmelroy/Localize-Swift.git", :tag => s.version.to_s, :submodules => true}
1313
s.social_media_url = "http://twitter.com/marmelroy"
1414

15-
s.ios.deployment_target = '8.0'
15+
s.ios.deployment_target = '9.0'
1616
s.osx.deployment_target = '10.9'
1717
s.tvos.deployment_target = '9.0'
1818
s.watchos.deployment_target = '2.0'
1919

20-
s.pod_target_xcconfig = { 'SWIFT_VERSION' => '5.0' }
20+
s.pod_target_xcconfig = { 'SWIFT_VERSION' => '5.3' }
2121
s.requires_arc = true
2222
s.source_files = 'Sources'
2323
end

‎Localize_Swift.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287
isa = PBXProject;
288288
attributes = {
289289
LastSwiftUpdateCheck = 0720;
290-
LastUpgradeCheck = 1020;
290+
LastUpgradeCheck = 1200;
291291
ORGANIZATIONNAME = "Roy Marmelstein";
292292
TargetAttributes = {
293293
3433F2351C518AF7003AE34D = {
@@ -308,7 +308,6 @@
308308
developmentRegion = en;
309309
hasScannedForEncodings = 0;
310310
knownRegions = (
311-
English,
312311
en,
313312
Base,
314313
);
@@ -451,6 +450,7 @@
451450
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
452451
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
453452
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
453+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
454454
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
455455
CLANG_WARN_STRICT_PROTOTYPES = YES;
456456
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -476,7 +476,7 @@
476476
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
477477
GCC_WARN_UNUSED_FUNCTION = YES;
478478
GCC_WARN_UNUSED_VARIABLE = YES;
479-
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
479+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
480480
MTL_ENABLE_DEBUG_INFO = YES;
481481
ONLY_ACTIVE_ARCH = YES;
482482
SDKROOT = iphoneos;
@@ -511,6 +511,7 @@
511511
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
512512
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
513513
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
514+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
514515
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
515516
CLANG_WARN_STRICT_PROTOTYPES = YES;
516517
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -530,7 +531,7 @@
530531
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
531532
GCC_WARN_UNUSED_FUNCTION = YES;
532533
GCC_WARN_UNUSED_VARIABLE = YES;
533-
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
534+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
534535
MTL_ENABLE_DEBUG_INFO = NO;
535536
SDKROOT = iphoneos;
536537
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -554,7 +555,7 @@
554555
DYLIB_INSTALL_NAME_BASE = "@rpath";
555556
INFOPLIST_FILE = Localize_Swift/Info.plist;
556557
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
557-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
558+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
558559
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
559560
ONLY_ACTIVE_ARCH = NO;
560561
PRODUCT_BUNDLE_IDENTIFIER = "com.roymarmelstein.Localize-Swift";
@@ -577,7 +578,7 @@
577578
DYLIB_INSTALL_NAME_BASE = "@rpath";
578579
INFOPLIST_FILE = Localize_Swift/Info.plist;
579580
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
580-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
581+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
581582
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
582583
PRODUCT_BUNDLE_IDENTIFIER = "com.roymarmelstein.Localize-Swift";
583584
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -619,7 +620,7 @@
619620
DYLIB_INSTALL_NAME_BASE = "@rpath";
620621
INFOPLIST_FILE = Localize_Swift/Info.plist;
621622
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
622-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
623+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
623624
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
624625
ONLY_ACTIVE_ARCH = NO;
625626
PRODUCT_BUNDLE_IDENTIFIER = "com.roymarmelstein.Localize-Swift";
@@ -642,7 +643,7 @@
642643
DYLIB_INSTALL_NAME_BASE = "@rpath";
643644
INFOPLIST_FILE = Localize_Swift/Info.plist;
644645
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
645-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
646+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
646647
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
647648
PRODUCT_BUNDLE_IDENTIFIER = "com.roymarmelstein.Localize-Swift";
648649
PRODUCT_NAME = Localize_Swift;
@@ -664,7 +665,7 @@
664665
DYLIB_INSTALL_NAME_BASE = "@rpath";
665666
INFOPLIST_FILE = "$(SRCROOT)/Localize_Swift/Info.plist";
666667
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
667-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
668+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
668669
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
669670
ONLY_ACTIVE_ARCH = NO;
670671
PRODUCT_BUNDLE_IDENTIFIER = "com.roymarmelstein.Localize-Swift";
@@ -674,7 +675,7 @@
674675
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
675676
SWIFT_VERSION = 5.0;
676677
TARGETED_DEVICE_FAMILY = 3;
677-
TVOS_DEPLOYMENT_TARGET = 9.0;
678+
TVOS_DEPLOYMENT_TARGET = 12.0;
678679
};
679680
name = Debug;
680681
};
@@ -690,15 +691,15 @@
690691
DYLIB_INSTALL_NAME_BASE = "@rpath";
691692
INFOPLIST_FILE = "$(SRCROOT)/Localize_Swift/Info.plist";
692693
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
693-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
694+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
694695
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
695696
PRODUCT_BUNDLE_IDENTIFIER = "com.roymarmelstein.Localize-Swift";
696697
PRODUCT_NAME = Localize_Swift;
697698
SDKROOT = appletvos;
698699
SKIP_INSTALL = YES;
699700
SWIFT_VERSION = 5.0;
700701
TARGETED_DEVICE_FAMILY = 3;
701-
TVOS_DEPLOYMENT_TARGET = 9.0;
702+
TVOS_DEPLOYMENT_TARGET = 12.0;
702703
};
703704
name = Release;
704705
};
@@ -714,7 +715,7 @@
714715
DYLIB_INSTALL_NAME_BASE = "@rpath";
715716
INFOPLIST_FILE = "$(SRCROOT)/Localize_Swift/Info.plist";
716717
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
717-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
718+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
718719
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
719720
ONLY_ACTIVE_ARCH = NO;
720721
PRODUCT_BUNDLE_IDENTIFIER = "com.roymarmelstein.Localize-Swift";
@@ -738,7 +739,7 @@
738739
DYLIB_INSTALL_NAME_BASE = "@rpath";
739740
INFOPLIST_FILE = "$(SRCROOT)/Localize_Swift/Info.plist";
740741
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
741-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
742+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
742743
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
743744
PRODUCT_BUNDLE_IDENTIFIER = "com.roymarmelstein.Localize-Swift";
744745
PRODUCT_NAME = Localize_Swift;

‎Localize_Swift.xcodeproj/xcshareddata/xcschemes/Localize_Swift OSX.xcscheme‎

Lines changed: 1 addition & 5 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 = "1020"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
</Testables>
32-
<AdditionalOptions>
33-
</AdditionalOptions>
3432
</TestAction>
3533
<LaunchAction
3634
buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
5149
ReferencedContainer = "container:Localize_Swift.xcodeproj">
5250
</BuildableReference>
5351
</MacroExpansion>
54-
<AdditionalOptions>
55-
</AdditionalOptions>
5652
</LaunchAction>
5753
<ProfileAction
5854
buildConfiguration = "Release"

‎Localize_Swift.xcodeproj/xcshareddata/xcschemes/Localize_Swift tvOS.xcscheme‎

Lines changed: 1 addition & 5 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 = "1020"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
</Testables>
32-
<AdditionalOptions>
33-
</AdditionalOptions>
3432
</TestAction>
3533
<LaunchAction
3634
buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
5149
ReferencedContainer = "container:Localize_Swift.xcodeproj">
5250
</BuildableReference>
5351
</MacroExpansion>
54-
<AdditionalOptions>
55-
</AdditionalOptions>
5652
</LaunchAction>
5753
<ProfileAction
5854
buildConfiguration = "Release"

0 commit comments

Comments
 (0)