Skip to content

Commit 9ece166

Browse files
mohammadnabulsimohammadnabulsi
authored
Merge pull request #13 from JNDisrupter/development
Upgrade to swift 5.0
2 parents b400264 + ef2ebb6 commit 9ece166

File tree

10 files changed

+43
-46
lines changed

10 files changed

+43
-46
lines changed

‎.swift-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Example/Example.xcodeproj/project.pbxproj

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@
103103
845DF2FF1F8FB61B0017F1E2 /* Frameworks */,
104104
845DF3001F8FB61B0017F1E2 /* Resources */,
105105
B59C766645876587D6A3B4B7 /* [CP] Embed Pods Frameworks */,
106-
A5283330CA38A40FB7053C3A /* [CP] Copy Pods Resources */,
107106
);
108107
buildRules = (
109108
);
@@ -121,11 +120,12 @@
121120
isa = PBXProject;
122121
attributes = {
123122
LastSwiftUpdateCheck = 0900;
124-
LastUpgradeCheck = 0900;
123+
LastUpgradeCheck = 1020;
125124
ORGANIZATIONNAME = JNDisrupter;
126125
TargetAttributes = {
127126
845DF3011F8FB61B0017F1E2 = {
128127
CreatedOnToolsVersion = 9.0;
128+
LastSwiftMigration = 1020;
129129
ProvisioningStyle = Automatic;
130130
};
131131
};
@@ -162,28 +162,13 @@
162162
/* End PBXResourcesBuildPhase section */
163163

164164
/* Begin PBXShellScriptBuildPhase section */
165-
A5283330CA38A40FB7053C3A /* [CP] Copy Pods Resources */ = {
166-
isa = PBXShellScriptBuildPhase;
167-
buildActionMask = 2147483647;
168-
files = (
169-
);
170-
inputPaths = (
171-
);
172-
name = "[CP] Copy Pods Resources";
173-
outputPaths = (
174-
);
175-
runOnlyForDeploymentPostprocessing = 0;
176-
shellPath = /bin/sh;
177-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh\"\n";
178-
showEnvVarsInLog = 0;
179-
};
180165
B59C766645876587D6A3B4B7 /* [CP] Embed Pods Frameworks */ = {
181166
isa = PBXShellScriptBuildPhase;
182167
buildActionMask = 2147483647;
183168
files = (
184169
);
185170
inputPaths = (
186-
"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
171+
"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
187172
"${BUILT_PRODUCTS_DIR}/JNAvatarWithInitials/JNAvatarWithInitials.framework",
188173
"${BUILT_PRODUCTS_DIR}/JNGroupAvatarImageView/JNGroupAvatarImageView.framework",
189174
"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
@@ -196,7 +181,7 @@
196181
);
197182
runOnlyForDeploymentPostprocessing = 0;
198183
shellPath = /bin/sh;
199-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
184+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
200185
showEnvVarsInLog = 0;
201186
};
202187
D169916BEC508D22C54FE9C6 /* [CP] Check Pods Manifest.lock */ = {
@@ -266,13 +251,15 @@
266251
CLANG_WARN_BOOL_CONVERSION = YES;
267252
CLANG_WARN_COMMA = YES;
268253
CLANG_WARN_CONSTANT_CONVERSION = YES;
254+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
269255
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
270256
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
271257
CLANG_WARN_EMPTY_BODY = YES;
272258
CLANG_WARN_ENUM_CONVERSION = YES;
273259
CLANG_WARN_INFINITE_RECURSION = YES;
274260
CLANG_WARN_INT_CONVERSION = YES;
275261
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
262+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
276263
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
277264
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
278265
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -300,7 +287,7 @@
300287
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
301288
GCC_WARN_UNUSED_FUNCTION = YES;
302289
GCC_WARN_UNUSED_VARIABLE = YES;
303-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
290+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
304291
MTL_ENABLE_DEBUG_INFO = YES;
305292
ONLY_ACTIVE_ARCH = YES;
306293
SDKROOT = iphoneos;
@@ -323,13 +310,15 @@
323310
CLANG_WARN_BOOL_CONVERSION = YES;
324311
CLANG_WARN_COMMA = YES;
325312
CLANG_WARN_CONSTANT_CONVERSION = YES;
313+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
326314
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
327315
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
328316
CLANG_WARN_EMPTY_BODY = YES;
329317
CLANG_WARN_ENUM_CONVERSION = YES;
330318
CLANG_WARN_INFINITE_RECURSION = YES;
331319
CLANG_WARN_INT_CONVERSION = YES;
332320
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
321+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
333322
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
334323
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
335324
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -351,7 +340,7 @@
351340
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
352341
GCC_WARN_UNUSED_FUNCTION = YES;
353342
GCC_WARN_UNUSED_VARIABLE = YES;
354-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
343+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
355344
MTL_ENABLE_DEBUG_INFO = NO;
356345
SDKROOT = iphoneos;
357346
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -370,7 +359,7 @@
370359
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
371360
PRODUCT_BUNDLE_IDENTIFIER = JNDisrupter.Example;
372361
PRODUCT_NAME = "$(TARGET_NAME)";
373-
SWIFT_VERSION = 4.0;
362+
SWIFT_VERSION = 5.0;
374363
TARGETED_DEVICE_FAMILY = "1,2";
375364
};
376365
name = Debug;
@@ -386,7 +375,7 @@
386375
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
387376
PRODUCT_BUNDLE_IDENTIFIER = JNDisrupter.Example;
388377
PRODUCT_NAME = "$(TARGET_NAME)";
389-
SWIFT_VERSION = 4.0;
378+
SWIFT_VERSION = 5.0;
390379
TARGETED_DEVICE_FAMILY = "1,2";
391380
};
392381
name = Release;

‎Example/Example.xcodeproj/xcuserdata/mohammadnabulsi.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@
77
<key>Example.xcscheme</key>
88
<dict>
99
<key>orderHint</key>
10-
<integer>0</integer>
10+
<integer>4</integer>
11+
</dict>
12+
<key>Example.xcscheme_^#shared#^_</key>
13+
<dict>
14+
<key>orderHint</key>
15+
<integer>4</integer>
1116
</dict>
1217
</dict>
1318
</dict>

‎Example/Example/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1414
var window: UIWindow?
1515

1616

17-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
17+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1818
// Override point for customization after application launch.
1919
return true
2020
}

‎Example/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ platform :ios, '9.0'
22
use_frameworks!
33

44
target 'Example' do
5-
pod 'JNGroupAvatarImageView' , :git => 'https://github.com/JNDisrupter/JNGroupAvatarImageView.git'
5+
pod 'JNGroupAvatarImageView' , :path => '../'
66
end

‎JNGroupAvatarImageView.podspec

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
Pod::Spec.new do |s|
2-
s.name = "JNGroupAvatarImageView"
3-
s.version = "1.2.3"
4-
s.summary = "Group avatar image view with initials"
5-
s.description = "This library provide a way to create group avatar images with initials"
6-
s.homepage = "https://github.com/JNDisrupter"
7-
s.license = { :type => "MIT", :file => "LICENSE" }
8-
s.authors = { "Jayel Zaghmoutt" => "eng.jayel.z@gmail.com", "Mohammad Nabulsi" => "mohammad.s.nabulsi@gmail.com" }
9-
s.ios.deployment_target = '9.0'
10-
s.source = { :git => "https://github.com/JNDisrupter/JNGroupAvatarImageView.git", :tag => "#{s.version}"}
11-
s.source_files = "JNGroupAvatarImageView/**/*.{swift}"
12-
s.screenshots = [ 'https://github.com/JNDisrupter/JNGroupAvatarImageView/raw/development/Images/screenshot1.png','https://github.com/JNDisrupter/JNGroupAvatarImageView/raw/development/Images/screenshot2.png','https://github.com/JNDisrupter/JNGroupAvatarImageView/raw/development/Images/screenshot3.png','https://github.com/JNDisrupter/JNGroupAvatarImageView/raw/development/Images/screenshot4.png','https://github.com/JNDisrupter/JNGroupAvatarImageView/raw/development/Images/screenshot5.png']
13-
s.dependency 'JNAvatarWithInitials' , '~> 1.1.2'
2+
s.name = "JNGroupAvatarImageView"
3+
s.version = "1.2.4"
4+
s.summary = "Group avatar image view with initials"
5+
s.description = "This library provide a way to create group avatar images with initials"
6+
s.homepage = "https://github.com/JNDisrupter"
7+
s.license = { :type => "MIT", :file => "LICENSE" }
8+
s.authors = { "Jayel Zaghmoutt" => "eng.jayel.z@gmail.com", "Mohammad Nabulsi" => "mohammad.s.nabulsi@gmail.com" }
9+
s.ios.deployment_target = '9.0'
10+
s.source = { :git => "https://github.com/JNDisrupter/JNGroupAvatarImageView.git", :tag => "#{s.version}"}
11+
s.source_files = "JNGroupAvatarImageView/**/*.{swift}"
12+
s.screenshots = [ 'https://github.com/JNDisrupter/JNGroupAvatarImageView/raw/development/Images/screenshot1.png','https://github.com/JNDisrupter/JNGroupAvatarImageView/raw/development/Images/screenshot2.png','https://github.com/JNDisrupter/JNGroupAvatarImageView/raw/development/Images/screenshot3.png','https://github.com/JNDisrupter/JNGroupAvatarImageView/raw/development/Images/screenshot4.png','https://github.com/JNDisrupter/JNGroupAvatarImageView/raw/development/Images/screenshot5.png']
13+
s.swift_version = '5.0'
14+
s.dependency 'JNAvatarWithInitials' , '~> 1.1.4'
1415
end

‎JNGroupAvatarImageView.xcodeproj/project.pbxproj

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,12 @@
121121
84B7B2181F71756F009CCC1D /* Project object */ = {
122122
isa = PBXProject;
123123
attributes = {
124-
LastUpgradeCheck = 0930;
124+
LastUpgradeCheck = 1020;
125125
ORGANIZATIONNAME = JNDisrupter;
126126
TargetAttributes = {
127127
84B7B2201F717570009CCC1D = {
128128
CreatedOnToolsVersion = 8.3.3;
129-
LastSwiftMigration = 1000;
129+
LastSwiftMigration = 1020;
130130
ProvisioningStyle = Automatic;
131131
};
132132
};
@@ -136,6 +136,7 @@
136136
developmentRegion = English;
137137
hasScannedForEncodings = 0;
138138
knownRegions = (
139+
English,
139140
en,
140141
);
141142
mainGroup = 84B7B2171F71756F009CCC1D;
@@ -196,6 +197,7 @@
196197
isa = XCBuildConfiguration;
197198
buildSettings = {
198199
ALWAYS_SEARCH_USER_PATHS = NO;
200+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
199201
CLANG_ANALYZER_NONNULL = YES;
200202
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
201203
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -260,6 +262,7 @@
260262
isa = XCBuildConfiguration;
261263
buildSettings = {
262264
ALWAYS_SEARCH_USER_PATHS = NO;
265+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
263266
CLANG_ANALYZER_NONNULL = YES;
264267
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
265268
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -331,7 +334,7 @@
331334
PRODUCT_NAME = "$(TARGET_NAME)";
332335
SKIP_INSTALL = YES;
333336
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
334-
SWIFT_VERSION = 4.2;
337+
SWIFT_VERSION = 5.0;
335338
};
336339
name = Debug;
337340
};
@@ -352,7 +355,7 @@
352355
PRODUCT_BUNDLE_IDENTIFIER = JNDisrupter.JNGroupAvatarImageView;
353356
PRODUCT_NAME = "$(TARGET_NAME)";
354357
SKIP_INSTALL = YES;
355-
SWIFT_VERSION = 4.2;
358+
SWIFT_VERSION = 5.0;
356359
};
357360
name = Release;
358361
};

‎JNGroupAvatarImageView.xcodeproj/xcuserdata/mohammadnabulsi.xcuserdatad/xcschemes/JNGroupAvatarImageView.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1000"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎JNGroupAvatarImageView/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>1.2.0</string>
18+
<string>1.2.4</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSPrincipalClass</key>

‎Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ platform :ios, '9.0'
22
use_frameworks!
33

44
target 'JNGroupAvatarImageView' do
5-
pod 'JNAvatarWithInitials'
5+
pod 'JNAvatarWithInitials'
66
end

0 commit comments

Comments
 (0)