Skip to content
This repository has been archived by the owner on Aug 1, 2019. It is now read-only.

Commit

Permalink
Merge pull request #44 from DavidSchechter/master
Browse files Browse the repository at this point in the history 
Migrated to Swift 3 and ASDK 1.9.90
  • Loading branch information
@atainter
atainter authored Sep 14, 2016
2 parents 0a3f9f7 + 0256f5f commit 8c41691
Show file tree
Hide file tree
Showing 43 changed files with 1,192 additions and 964 deletions.
4 changes: 2 additions & 2 deletions NMessenger.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Pod::Spec.new do |s|
#

s.name = "NMessenger"
s.version = "1.0.76"
s.version = "1.0.77"
s.summary = "A fast, lightweight messenger component built on AsyncDisplaykit and written in Swift"

# This description is used to generate tags and improve search results.
Expand Down Expand Up @@ -133,5 +133,5 @@ NMessenger is a fast, lightweight messenger component built on AsyncDisplaykit a
s.requires_arc = true

# s.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" }
s.dependency "AsyncDisplayKit", "1.9.80"
s.dependency "AsyncDisplayKit", "1.9.90"
end
2 changes: 1 addition & 1 deletion Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ target 'nMessenger' do
use_frameworks!

# Pods for nMessenger
pod 'AsyncDisplayKit', '1.9.80'
pod 'AsyncDisplayKit', ‘1.9.90'
target 'nMessengerTests' do
inherit! :search_paths
Expand Down
4 changes: 4 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ pod 'NMessenger'
```

## Notes
###For iOS 10 Support
Add `NSPhotoLibraryUsageDescription` and `NSCameraUsageDescription` to your App Info.plist to specify the reason for accessing photo library and camera. See [Cocoa Keys](https://developer.apple.com/library/content/documentation/General/Reference/InfoPlistKeyReference/Articles/CocoaKeys.html) for more details.

###Landscape Mode
- **Landscape mode is not currently supported.** While it may be supported in a future release, we have disabled device rotation for `NMessengerViewController` to prevent issues.

## Getting Started
Expand Down
123 changes: 122 additions & 1 deletion nMessenger.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,13 @@
path = Extensions;
sourceTree = "<group>";
};
7E0C8FBB9D65E94C7CDC7F2A /* Pods */ = {
isa = PBXGroup;
children = (
);
name = Pods;
sourceTree = "<group>";
};
CEEA4FEAB14A1E9BACDB8B3A /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand All @@ -481,6 +488,7 @@
F1418D051D380B2400C404B5 /* nMessengerUITests */,
F1418CE41D380B2400C404B5 /* Products */,
CEEA4FEAB14A1E9BACDB8B3A /* Frameworks */,
7E0C8FBB9D65E94C7CDC7F2A /* Pods */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -906,9 +914,12 @@
isa = PBXNativeTarget;
buildConfigurationList = F1418D0E1D380B2400C404B5 /* Build configuration list for PBXNativeTarget "nMessengerTests" */;
buildPhases = (
A1EAC93D3E60EE9287D5A1A1 /* [CP] Check Pods Manifest.lock */,
F1418CF31D380B2400C404B5 /* Sources */,
F1418CF41D380B2400C404B5 /* Frameworks */,
F1418CF51D380B2400C404B5 /* Resources */,
C0C629968B1A2B229A2FC68A /* [CP] Embed Pods Frameworks */,
B63E1D299EF994DC6556DA08 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -924,9 +935,12 @@
isa = PBXNativeTarget;
buildConfigurationList = F1418D111D380B2400C404B5 /* Build configuration list for PBXNativeTarget "nMessengerUITests" */;
buildPhases = (
D85CE90B54825D807BA9D883 /* [CP] Check Pods Manifest.lock */,
F1418CFE1D380B2400C404B5 /* Sources */,
F1418CFF1D380B2400C404B5 /* Frameworks */,
F1418D001D380B2400C404B5 /* Resources */,
F7B47B6A4B98158750DAB112 /* [CP] Embed Pods Frameworks */,
92EE1EB1707ECEA825593FBA /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -945,18 +959,21 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0730;
LastUpgradeCheck = 0730;
LastUpgradeCheck = 0800;
ORGANIZATIONNAME = "Ebay Inc.";
TargetAttributes = {
F1418CE21D380B2400C404B5 = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0800;
};
F1418CF61D380B2400C404B5 = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0800;
TestTargetID = F1418CE21D380B2400C404B5;
};
F1418D011D380B2400C404B5 = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0800;
TestTargetID = F1418CE21D380B2400C404B5;
};
};
Expand Down Expand Up @@ -1141,6 +1158,99 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
92EE1EB1707ECEA825593FBA /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-nMessengerUITests/Pods-nMessengerUITests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
A1EAC93D3E60EE9287D5A1A1 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
B63E1D299EF994DC6556DA08 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-nMessengerTests/Pods-nMessengerTests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
C0C629968B1A2B229A2FC68A /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-nMessengerTests/Pods-nMessengerTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
D85CE90B54825D807BA9D883 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
F7B47B6A4B98158750DAB112 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-nMessengerUITests/Pods-nMessengerUITests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
F1418CDF1D380B2400C404B5 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -1259,8 +1369,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand Down Expand Up @@ -1305,8 +1417,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand All @@ -1325,6 +1439,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
Expand All @@ -1340,6 +1455,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ebay.nMessenger;
PRODUCT_NAME = nMessenger;
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -1353,6 +1469,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ebay.nMessenger;
PRODUCT_NAME = nMessenger;
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -1364,6 +1481,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ebay.nMessengerTests;
PRODUCT_NAME = nMessengerTests;
SWIFT_VERSION = 3.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/nMessenger.app/nMessenger";
};
name = Debug;
Expand All @@ -1376,6 +1494,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ebay.nMessengerTests;
PRODUCT_NAME = nMessengerTests;
SWIFT_VERSION = 3.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/nMessenger.app/nMessenger";
};
name = Release;
Expand All @@ -1387,6 +1506,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ebay.nMessengerUITests;
PRODUCT_NAME = nMessengerUITests;
SWIFT_VERSION = 3.0;
TEST_TARGET_NAME = nMessenger;
};
name = Debug;
Expand All @@ -1398,6 +1518,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ebay.nMessengerUITests;
PRODUCT_NAME = nMessengerUITests;
SWIFT_VERSION = 3.0;
TEST_TARGET_NAME = nMessenger;
};
name = Release;
Expand Down
12 changes: 6 additions & 6 deletions nMessenger/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?


func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}

func applicationWillResignActive(application: UIApplication) {
func applicationWillResignActive(_ application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
}

func applicationDidEnterBackground(application: UIApplication) {
func applicationDidEnterBackground(_ application: UIApplication) {
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
}

func applicationWillEnterForeground(application: UIApplication) {
func applicationWillEnterForeground(_ application: UIApplication) {
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
}

func applicationDidBecomeActive(application: UIApplication) {
func applicationDidBecomeActive(_ application: UIApplication) {
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
}

func applicationWillTerminate(application: UIApplication) {
func applicationWillTerminate(_ application: UIApplication) {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}

Expand Down
20 changes: 20 additions & 0 deletions nMessenger/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "29x29",
Expand Down Expand Up @@ -30,6 +40,16 @@
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "29x29",
Expand Down
5 changes: 5 additions & 0 deletions nMessenger/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,10 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>NSPhotoLibraryUsageDescription</key>
<string>$(PRODUCT_NAME) wants acceess to Photos</string>
<key>NSCameraUsageDescription</key>
<string>$(PRODUCT_NAME) wants acceess to Camera</string>

</dict>
</plist>
Loading

0 comments on commit 8c41691

Please sign in to comment.