Merge pull request #36 from Nirma/feature/project-modernization

Project modernization
Nirma · Jun 5, 2019 · cad7fda · cad7fda
2 parents b895375 + 72b17ad
commit cad7fda
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,9 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode10.2
 xcode_project: UIDeviceComplete.xcodeproj
 xcode_scheme: UIDeviceComplete
 
 script:
-  - xcodebuild test -scheme UIDeviceComplete -sdk iphonesimulator -destination 'OS=11.0,name=iPhone 6 Plus'
+  - xcodebuild test -scheme UIDeviceComplete -sdk iphonesimulator -destination 'OS=12.0,name=iPhone 8'
 after_success:
   - bash <(curl -s https://codecov.io/bash)
diff --git a/Sources/DeviceFamily.swift b/Sources/DeviceFamily.swift
@@ -1,7 +1,7 @@
 //
 // DeviceFamily.swift
 //
-// Copyright (c) 2017-2018 Nicholas Maccharoli
+// Copyright (c) 2017-2019 Nicholas Maccharoli
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/Sources/DeviceModel.swift b/Sources/DeviceModel.swift
@@ -1,7 +1,7 @@
 //
 // DeviceModel.swift
 //
-// Copyright (c) 2017-2018 Nicholas Maccharoli
+// Copyright (c) 2017-2019 Nicholas Maccharoli
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/Sources/Identifier.swift b/Sources/Identifier.swift
@@ -1,7 +1,7 @@
 //
 // Identifier.swift
 //
-// Copyright (c) 2017-2018 Nicholas Maccharoli
+// Copyright (c) 2017-2019 Nicholas Maccharoli
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/Sources/Screen.swift b/Sources/Screen.swift
@@ -1,7 +1,7 @@
 //
 // Screen.swift
 //
-// Copyright (c) 2017-2018 Nicholas Maccharoli
+// Copyright (c) 2017-2019 Nicholas Maccharoli
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/Sources/System.swift b/Sources/System.swift
@@ -1,7 +1,7 @@
 //
 // System.swift
 //
-// Copyright (c) 2017-2018 Nicholas Maccharoli
+// Copyright (c) 2017-2019 Nicholas Maccharoli
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/Sources/UIDeviceComplete.swift b/Sources/UIDeviceComplete.swift
@@ -1,7 +1,7 @@
 //
 // UIDeviceComplete.swift
 //
-// Copyright (c) 2017-2018 Nicholas Maccharoli
+// Copyright (c) 2017-2019 Nicholas Maccharoli
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/Sources/UIDeviceExtensions.swift b/Sources/UIDeviceExtensions.swift
@@ -1,7 +1,7 @@
 //
 // UIDevice+Extensions.swift
 //
-// Copyright (c) 2017-2018 Nicholas Maccharoli
+// Copyright (c) 2017-2019 Nicholas Maccharoli
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/Tests/DeviceFamilyTests.swift b/Tests/DeviceFamilyTests.swift
@@ -1,7 +1,7 @@
 //
 // DeviceFamilyTests.swift
 //
-// Copyright (c) 2017-2018 Nicholas Maccharoli
+// Copyright (c) 2017-2019 Nicholas Maccharoli
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/Tests/DeviceModelTests.swift b/Tests/DeviceModelTests.swift
@@ -3,7 +3,7 @@
 //  UIDeviceCompleteTests
 //
 //  Created by Vincent on 26/9/18.
-//  Copyright © 2018 Nicholas Maccharoli
+//  Copyright © 2018-2019 Nicholas Maccharoli
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/Tests/IdentifierTests.swift b/Tests/IdentifierTests.swift
@@ -1,7 +1,7 @@
 //
 // IdentifierTests.swift
 //
-// Copyright (c) 2017-2018 Nicholas Maccharoli
+// Copyright (c) 2017-2019 Nicholas Maccharoli
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/Tests/SystemTests.swift b/Tests/SystemTests.swift
@@ -1,7 +1,7 @@
 //
 // SystemTests.swift
 //
-// Copyright (c) 2017-2018 Nicholas Maccharoli
+// Copyright (c) 2017-2019 Nicholas Maccharoli
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/Tests/UIDeviceExtensionsTests.swift b/Tests/UIDeviceExtensionsTests.swift
@@ -1,7 +1,7 @@
 //
 // UIDeviceExtensionsTests .swift
 //
-// Copyright (c) 2017-2018 Nicholas Maccharoli
+// Copyright (c) 2017-2019 Nicholas Maccharoli
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/UIDeviceComplete.xcodeproj/project.pbxproj b/UIDeviceComplete.xcodeproj/project.pbxproj
@@ -50,7 +50,7 @@
 		AAB1EF2F1F13866F003BBCF2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		AAB1EF341F13866F003BBCF2 /* UIDeviceCompleteTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UIDeviceCompleteTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		AAB1EF3B1F13866F003BBCF2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		BFA9121B215B9881000CD8A8 /* DeviceModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DeviceModelTests.swift; path = Tests/DeviceModelTests.swift; sourceTree = SOURCE_ROOT; };
+		BFA9121B215B9881000CD8A8 /* DeviceModelTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DeviceModelTests.swift; path = Tests/DeviceModelTests.swift; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -184,27 +184,28 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Nicholas Maccharoli";
 				TargetAttributes = {
 					AAB1EF2A1F13866F003BBCF2 = {
 						CreatedOnToolsVersion = 8.3.3;
-						LastSwiftMigration = "";
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					AAB1EF331F13866F003BBCF2 = {
 						CreatedOnToolsVersion = 8.3.3;
-						LastSwiftMigration = "";
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 				};
 			};
 			buildConfigurationList = AAB1EF251F13866F003BBCF2 /* Build configuration list for PBXProject "UIDeviceComplete" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = AAB1EF211F13866F003BBCF2;
 			productRefGroup = AAB1EF2C1F13866F003BBCF2 /* Products */;
@@ -276,6 +277,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -338,6 +340,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -408,7 +411,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -430,7 +433,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = nmaccharoli.UIDeviceComplete;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -448,7 +451,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -464,7 +467,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = nmaccharoli.UIDeviceCompleteTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/UIDeviceComplete.xcodeproj/xcshareddata/xcschemes/UIDeviceComplete.xcscheme b/UIDeviceComplete.xcodeproj/xcshareddata/xcschemes/UIDeviceComplete.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/UIDeviceComplete/UIDeviceComplete.h b/UIDeviceComplete/UIDeviceComplete.h
@@ -1,7 +1,7 @@
 //
 // UIDeviceComplete.h
 //
-// Copyright (c) 2017-2018 Nicholas Maccharoli
+// Copyright (c) 2017-2019 Nicholas Maccharoli
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal