Skip to content

Commit 771a592

Browse files
Merge pull request #6 from JNDisrupter/development
Development
2 parents df85ee7 + 8d8b210 commit 771a592

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+635
-515
lines changed

.swift-version

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

Example/JNHorizontalGroupAvatarCollectionView.xcodeproj/project.pbxproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
/* End PBXContainerItemProxy section */
3030

3131
/* Begin PBXFileReference section */
32-
1ACEFD17A61600D482B0D94D /* JNHorizontalGroupAvatarCollectionView.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = JNHorizontalGroupAvatarCollectionView.podspec; path = ../JNHorizontalGroupAvatarCollectionView.podspec; sourceTree = "<group>"; };
32+
1ACEFD17A61600D482B0D94D /* JNHorizontalGroupAvatarCollectionView.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = JNHorizontalGroupAvatarCollectionView.podspec; path = ../JNHorizontalGroupAvatarCollectionView.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
3333
3AE431F2F53E0BF007A410A0 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
3434
3FBCA8D08664134488C2FD75 /* Pods_JNHorizontalGroupAvatarCollectionView_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_JNHorizontalGroupAvatarCollectionView_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3535
607FACD01AFB9204008FA782 /* JNHorizontalGroupAvatarCollectionView_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JNHorizontalGroupAvatarCollectionView_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -194,7 +194,7 @@
194194
607FACCF1AFB9204008FA782 = {
195195
CreatedOnToolsVersion = 6.3.1;
196196
DevelopmentTeam = 57M378XZD9;
197-
LastSwiftMigration = 0900;
197+
LastSwiftMigration = 1000;
198198
};
199199
607FACE41AFB9204008FA782 = {
200200
CreatedOnToolsVersion = 6.3.1;
@@ -451,8 +451,7 @@
451451
MODULE_NAME = ExampleApp;
452452
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
453453
PRODUCT_NAME = "$(TARGET_NAME)";
454-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
455-
SWIFT_VERSION = 4.0;
454+
SWIFT_VERSION = 4.2;
456455
};
457456
name = Debug;
458457
};
@@ -467,8 +466,7 @@
467466
MODULE_NAME = ExampleApp;
468467
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
469468
PRODUCT_NAME = "$(TARGET_NAME)";
470-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
471-
SWIFT_VERSION = 4.0;
469+
SWIFT_VERSION = 4.2;
472470
};
473471
name = Release;
474472
};

Example/JNHorizontalGroupAvatarCollectionView.xcodeproj/xcshareddata/xcschemes/JNHorizontalGroupAvatarCollectionView-Example.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 = "0930"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Example/JNHorizontalGroupAvatarCollectionView/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.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
PODS:
2-
- JNAvatarWithInitials (1.1.1):
3-
- SDWebImage (~> 4.3.3)
4-
- JNGroupAvatarImageView (1.2.1):
5-
- JNAvatarWithInitials (~> 1.1.0)
6-
- JNHorizontalGroupAvatarCollectionView (1.0.2):
7-
- JNGroupAvatarImageView
8-
- SDWebImage (4.3.3):
9-
- SDWebImage/Core (= 4.3.3)
10-
- SDWebImage/Core (4.3.3)
2+
- JNAvatarWithInitials (1.1.2):
3+
- SDWebImage (~> 4.4.2)
4+
- JNGroupAvatarImageView (1.2.3):
5+
- JNAvatarWithInitials (~> 1.1.2)
6+
- JNHorizontalGroupAvatarCollectionView (1.0.3):
7+
- JNGroupAvatarImageView (~> 1.2.3)
8+
- SDWebImage (4.4.2):
9+
- SDWebImage/Core (= 4.4.2)
10+
- SDWebImage/Core (4.4.2)
1111

1212
DEPENDENCIES:
1313
- JNHorizontalGroupAvatarCollectionView (from `../`)
@@ -23,10 +23,10 @@ EXTERNAL SOURCES:
2323
:path: "../"
2424

2525
SPEC CHECKSUMS:
26-
JNAvatarWithInitials: c0c5f5049d868d4a66dc16e3e9217232977cc9cf
27-
JNGroupAvatarImageView: 00330c921cecd63d38e772cf4cd7584651da23ca
28-
JNHorizontalGroupAvatarCollectionView: f24d12c517522e2afc2e2cd74360eeaed7290760
29-
SDWebImage: de4d90b5bff3571eae7bd16202b1f43135409fa5
26+
JNAvatarWithInitials: 806ccb76bd4d3c43c7498b2346eab57a6045ea4e
27+
JNGroupAvatarImageView: 0b69f44b4ed378dbd17bf80055abdcc921e64fd4
28+
JNHorizontalGroupAvatarCollectionView: d0efec39ae81b984c9d01628f4c18a39f55b43f2
29+
SDWebImage: 624d6e296c69b244bcede364c72ae0430ac14681
3030

3131
PODFILE CHECKSUM: 3a4af99e4873fae71fccdaf30b1804a95aac3f8e
3232

Example/Pods/JNAvatarWithInitials/JNAvatarWithInitials/JNAvatarWithInitials.swift

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/JNGroupAvatarImageView/JNGroupAvatarImageView/JNGroupAvatarImageView.swift

Lines changed: 38 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Local Podspecs/JNHorizontalGroupAvatarCollectionView.podspec.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Manifest.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)