Skip to content

Commit bea6099

Browse files
hentekohenteko
committed
Merge pull request #4 from DeployGate/feature/xcode7
Support Xcode7
2 parents 0e6eba5 + 4aa0773 commit bea6099

File tree

9 files changed

+24
-12
lines changed

9 files changed

+24
-12
lines changed

‎objective-c/deploygate-ios-sdk-sample.xcodeproj/project.pbxproj

+6-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
EDCA63FD1B8DA7FC009837E6 /* Project object */ = {
199199
isa = PBXProject;
200200
attributes = {
201-
LastUpgradeCheck = 0640;
201+
LastUpgradeCheck = 0700;
202202
ORGANIZATIONNAME = DeployGate;
203203
TargetAttributes = {
204204
EDCA64041B8DA7FC009837E6 = {
@@ -353,6 +353,7 @@
353353
COPY_PHASE_STRIP = NO;
354354
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
355355
ENABLE_STRICT_OBJC_MSGSEND = YES;
356+
ENABLE_TESTABILITY = YES;
356357
GCC_C_LANGUAGE_STANDARD = gnu99;
357358
GCC_DYNAMIC_NO_PIC = NO;
358359
GCC_NO_COMMON_BLOCKS = YES;
@@ -421,6 +422,7 @@
421422
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
422423
INFOPLIST_FILE = "deploygate-ios-sdk-sample/Info.plist";
423424
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
425+
PRODUCT_BUNDLE_IDENTIFIER = "com.deploygate.$(PRODUCT_NAME:rfc1034identifier)";
424426
PRODUCT_NAME = "$(TARGET_NAME)";
425427
};
426428
name = Debug;
@@ -432,6 +434,7 @@
432434
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
433435
INFOPLIST_FILE = "deploygate-ios-sdk-sample/Info.plist";
434436
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
437+
PRODUCT_BUNDLE_IDENTIFIER = "com.deploygate.$(PRODUCT_NAME:rfc1034identifier)";
435438
PRODUCT_NAME = "$(TARGET_NAME)";
436439
};
437440
name = Release;
@@ -450,6 +453,7 @@
450453
);
451454
INFOPLIST_FILE = "deploygate-ios-sdk-sampleTests/Info.plist";
452455
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
456+
PRODUCT_BUNDLE_IDENTIFIER = "com.deploygate.$(PRODUCT_NAME:rfc1034identifier)";
453457
PRODUCT_NAME = "$(TARGET_NAME)";
454458
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/deploygate-ios-sdk-sample.app/deploygate-ios-sdk-sample";
455459
};
@@ -465,6 +469,7 @@
465469
);
466470
INFOPLIST_FILE = "deploygate-ios-sdk-sampleTests/Info.plist";
467471
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
472+
PRODUCT_BUNDLE_IDENTIFIER = "com.deploygate.$(PRODUCT_NAME:rfc1034identifier)";
468473
PRODUCT_NAME = "$(TARGET_NAME)";
469474
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/deploygate-ios-sdk-sample.app/deploygate-ios-sdk-sample";
470475
};

‎objective-c/deploygate-ios-sdk-sample/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.deploygate.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

‎objective-c/deploygate-ios-sdk-sampleTests/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.deploygate.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

‎swift/deploygate-ios-sdk-swift-sample.xcodeproj/project.pbxproj

+8-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,9 @@
187187
EDF477611B9439FC0085C38C /* Project object */ = {
188188
isa = PBXProject;
189189
attributes = {
190-
LastUpgradeCheck = 0640;
190+
LastSwiftMigration = 0700;
191+
LastSwiftUpdateCheck = 0700;
192+
LastUpgradeCheck = 0700;
191193
ORGANIZATIONNAME = DeployGate;
192194
TargetAttributes = {
193195
EDF477681B9439FC0085C38C = {
@@ -341,6 +343,7 @@
341343
COPY_PHASE_STRIP = NO;
342344
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
343345
ENABLE_STRICT_OBJC_MSGSEND = YES;
346+
ENABLE_TESTABILITY = YES;
344347
GCC_C_LANGUAGE_STANDARD = gnu99;
345348
GCC_DYNAMIC_NO_PIC = NO;
346349
GCC_NO_COMMON_BLOCKS = YES;
@@ -411,6 +414,7 @@
411414
CLANG_ENABLE_MODULES = YES;
412415
INFOPLIST_FILE = "deploygate-ios-sdk-swift-sample/Info.plist";
413416
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
417+
PRODUCT_BUNDLE_IDENTIFIER = "com.deploygate.$(PRODUCT_NAME:rfc1034identifier)";
414418
PRODUCT_NAME = "$(TARGET_NAME)";
415419
SWIFT_OBJC_BRIDGING_HEADER = "deploygate-ios-sdk-swift-sample/deploygate-ios-sdk-swift-sample-Bridging-Header.h";
416420
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -425,6 +429,7 @@
425429
CLANG_ENABLE_MODULES = YES;
426430
INFOPLIST_FILE = "deploygate-ios-sdk-swift-sample/Info.plist";
427431
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
432+
PRODUCT_BUNDLE_IDENTIFIER = "com.deploygate.$(PRODUCT_NAME:rfc1034identifier)";
428433
PRODUCT_NAME = "$(TARGET_NAME)";
429434
SWIFT_OBJC_BRIDGING_HEADER = "deploygate-ios-sdk-swift-sample/deploygate-ios-sdk-swift-sample-Bridging-Header.h";
430435
};
@@ -444,6 +449,7 @@
444449
);
445450
INFOPLIST_FILE = "deploygate-ios-sdk-swift-sampleTests/Info.plist";
446451
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
452+
PRODUCT_BUNDLE_IDENTIFIER = "com.deploygate.$(PRODUCT_NAME:rfc1034identifier)";
447453
PRODUCT_NAME = "$(TARGET_NAME)";
448454
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/deploygate-ios-sdk-swift-sample.app/deploygate-ios-sdk-swift-sample";
449455
};
@@ -459,6 +465,7 @@
459465
);
460466
INFOPLIST_FILE = "deploygate-ios-sdk-swift-sampleTests/Info.plist";
461467
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
468+
PRODUCT_BUNDLE_IDENTIFIER = "com.deploygate.$(PRODUCT_NAME:rfc1034identifier)";
462469
PRODUCT_NAME = "$(TARGET_NAME)";
463470
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/deploygate-ios-sdk-swift-sample.app/deploygate-ios-sdk-swift-sample";
464471
};

‎swift/deploygate-ios-sdk-swift-sample/AppDelegate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
4242
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
4343
}
4444

45-
func application(application: UIApplication, openURL url: NSURL, sourceApplication: String?, annotation: AnyObject?) -> Bool {
45+
func application(application: UIApplication, openURL url: NSURL, sourceApplication: String?, annotation: AnyObject) -> Bool {
4646
return DeployGateSDK.sharedInstance().handleOpenUrl(url, sourceApplication: sourceApplication, annotation: annotation)
4747
}
4848
}

‎swift/deploygate-ios-sdk-swift-sample/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.deploygate.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

‎swift/deploygate-ios-sdk-swift-sample/SendLogViewController.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ class SendLogViewController: UIViewController {
2020
}
2121

2222
@IBAction func sendLog(sender: AnyObject) {
23-
var text = textView.text
23+
let text = textView.text
2424
textView.text = ""
2525

2626
DGSLogv("%@", getVaList([text]))
27-
var alert:UIAlertController = UIAlertController(title: "DGSLog Done", message: "Require relaunch app", preferredStyle: UIAlertControllerStyle.Alert)
27+
let alert:UIAlertController = UIAlertController(title: "DGSLog Done", message: "Require relaunch app", preferredStyle: UIAlertControllerStyle.Alert)
2828
alert.addAction(UIAlertAction(title: "Continue", style: UIAlertActionStyle.Cancel, handler:nil))
2929
alert.addAction(UIAlertAction(title: "Relaunch",
3030
style: UIAlertActionStyle.Default,
3131
handler:{
32-
(action:UIAlertAction!) -> Void in
32+
(action:UIAlertAction) -> Void in
3333
exit(0) // finish application
3434
}))
3535
presentViewController(alert, animated: true, completion: nil)

‎swift/deploygate-ios-sdk-swift-sample/ViewController.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ class ViewController: UIViewController, UITableViewDataSource, UITableViewDelega
4646
}
4747

4848
func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
49-
var cell = tableView.cellForRowAtIndexPath(indexPath)
49+
let cell = tableView.cellForRowAtIndexPath(indexPath)
5050
if cell!.textLabel!.text! == authorize {
5151
DeployGateSDK.sharedInstance().userAuthorizationWithCompletionHandler({ (authorized, error) -> Void in
5252
dispatch_async(dispatch_get_main_queue(), { () -> Void in
53-
var alert:UIAlertController = UIAlertController(title: "Authorize", message: authorized ? "Success" : "Failed", preferredStyle: UIAlertControllerStyle.Alert)
53+
let alert:UIAlertController = UIAlertController(title: "Authorize", message: authorized ? "Success" : "Failed", preferredStyle: UIAlertControllerStyle.Alert)
5454
alert.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.Default, handler:nil))
5555
self.presentViewController(alert, animated: true, completion: nil)
5656
})

‎swift/deploygate-ios-sdk-swift-sampleTests/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.deploygate.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

0 commit comments

Comments
 (0)