Merge pull request #80 from fassko/1.5

1.5
fassko · Oct 30, 2016 · fd64f5a · fd64f5a
2 parents 7c1929a + 7b03c2a
commit fd64f5a
Show file tree

Hide file tree

Showing 698 changed files with 63,750 additions and 36,932 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,13 @@
 before_install:
-  - gem update cocoapods --no-document
+  - gem update cocoapods --no-document --pre
   - gem update fastlane --no-document
   - fastlane --version
   - gem cleanup
-  - brew update
   - brew outdated xctool || brew upgrade xctool
   - pod --version
-  - pod repo update
+  - pod repo update --silent
 language: objective-c
-osx_image: xcode7.3
+osx_image: xcode8
 script:
   - fastlane travis
 notifications: change
diff --git a/Dodies.lv.xcodeproj/project.pbxproj b/Dodies.lv.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 48;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -78,6 +78,7 @@
 		63224DB81D2AF4DA0015596F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		63224DBA1D2AFA9F0015596F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = "<group>"; };
 		63475FEB1C5CC95500A9A5E4 /* DodiesPoint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DodiesPoint.swift; sourceTree = "<group>"; };
+		6356E2FC1DC5FC980072540C /* Dodies.lv.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Dodies.lv.entitlements; sourceTree = "<group>"; };
 		636EA8321BA5BDF40071397A /* Dodies.lv.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Dodies.lv.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		636EA8351BA5BDF40071397A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		636EA8411BA5BDF40071397A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -184,6 +185,7 @@
 		636EA8341BA5BDF40071397A /* Dodies.lv */ = {
 			isa = PBXGroup;
 			children = (
+				6356E2FC1DC5FC980072540C /* Dodies.lv.entitlements */,
 				636EA8351BA5BDF40071397A /* AppDelegate.swift */,
 				63AFB8001C5E3FFC004A58E1 /* Helper.swift */,
 				63AFB7ED1C5D29B4004A58E1 /* Views */,
@@ -334,20 +336,24 @@
 				TargetAttributes = {
 					636EA8311BA5BDF40071397A = {
 						CreatedOnToolsVersion = 7.1;
-						DevelopmentTeam = 3SGNZQGS68;
+						LastSwiftMigration = 0800;
+						ProvisioningStyle = Manual;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
 								enabled = 1;
 							};
 							com.apple.Maps.iOS = {
 								enabled = 0;
 							};
+							com.apple.Push = {
+								enabled = 0;
+							};
 						};
 					};
 				};
 			};
 			buildConfigurationList = 636EA82D1BA5BDF40071397A /* Build configuration list for PBXProject "Dodies.lv" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 8.0";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -440,7 +446,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
+			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;
 		};
 		63AFB8021C5E4412004A58E1 /* ShellScript */ = {
@@ -539,6 +545,7 @@
 		636EA8441BA5BDF40071397A /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -556,7 +563,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer: Kristaps Grinbergs (MMGQCA8E72)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Kristaps Grinbergs (MMGQCA8E72)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 52;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -576,12 +583,13 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.1;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/Dodies.lv/Dodies-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0.1;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "";
 				VERSIONING_SYSTEM = "apple-generic";
@@ -591,6 +599,7 @@
 		636EA8451BA5BDF40071397A /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -608,7 +617,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Kristaps Grinbergs (3SGNZQGS68)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Kristaps Grinbergs (3SGNZQGS68)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 52;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
@@ -622,10 +631,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/Dodies.lv/Dodies-Bridging-Header.h";
+				SWIFT_VERSION = 3.0.1;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "";
 				VALIDATE_PRODUCT = YES;
@@ -640,16 +650,20 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
 				CODE_SIGN_IDENTITY = "iPhone Developer: Kristaps Grinbergs (MMGQCA8E72)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Kristaps Grinbergs (MMGQCA8E72)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				DEVELOPMENT_TEAM = 3SGNZQGS68;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
 				INFOPLIST_FILE = Dodies.lv/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.fassko.Dodies-lv";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "6ce7d206-45f0-4e73-8a20-310adbcbce4b";
+				PROVISIONING_PROFILE_SPECIFIER = "match Development com.fassko.Dodies-lv";
+				SWIFT_VERSION = 3.0.1;
 			};
 			name = Debug;
 		};
@@ -660,16 +674,20 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Kristaps Grinbergs (3SGNZQGS68)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Kristaps Grinbergs (3SGNZQGS68)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				DEVELOPMENT_TEAM = 3SGNZQGS68;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
 				INFOPLIST_FILE = Dodies.lv/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.fassko.Dodies-lv";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "334705a6-af7c-42ae-8215-32bf7fe3481d";
+				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.fassko.Dodies-lv";
+				SWIFT_VERSION = 3.0.1;
 			};
 			name = Release;
 		};

diff --git a/Dodies.lv/AboutViewController.swift b/Dodies.lv/AboutViewController.swift
@@ -24,7 +24,7 @@ class AboutViewController: UIViewController {
   }
 
   @IBAction func openDodiesLv(sender: AnyObject) {
-    UIApplication.sharedApplication().openURL(NSURL(string: "http://dodies.lv/par.php")!)
+    UIApplication.shared.openURL(NSURL(string: "http://dodies.lv/par.php")! as URL)
   }
 
 }
diff --git a/Dodies.lv/AppDelegate.swift b/Dodies.lv/AppDelegate.swift
@@ -18,25 +18,25 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
   var window: UIWindow?
 
-  func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+  private func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
 
     Fabric.with([Crashlytics.self])
 
-    DDLog.addLogger(DDTTYLogger.sharedInstance()) // TTY = Xcode console
-    DDLog.addLogger(DDASLLogger.sharedInstance()) // ASL = Apple System Logs
+    DDLog.add(DDTTYLogger.sharedInstance()) // TTY = Xcode console
+    DDLog.add(DDASLLogger.sharedInstance()) // ASL = Apple System Logs
 
     // Configure tracker from GoogleService-Info.plist.
     var configureError:NSError?
     GGLContext.sharedInstance().configureWithError(&configureError)
     assert(configureError == nil, "Error configuring Google services: \(configureError)")
 
     // Optional: configure GAI options.
-    var gai = GAI.sharedInstance()
-    gai.trackUncaughtExceptions = true  // report uncaught exceptions
-    gai.logger.logLevel = GAILogLevel.Verbose  // remove before app release
+    let gai = GAI.sharedInstance()
+    gai?.trackUncaughtExceptions = true  // report uncaught exceptions
+    gai?.logger.logLevel = GAILogLevel.verbose  // remove before app release
 
-    UIApplication.sharedApplication().statusBarStyle = .LightContent
-    UINavigationBar.appearance().barStyle = .Black
+    UIApplication.shared.statusBarStyle = .lightContent
+    UINavigationBar.appearance().barStyle = .black
 
     let config = Realm.Configuration(
     schemaVersion: 1,
@@ -45,7 +45,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     migrationBlock: { migration, oldSchemaVersion in
 
       if (oldSchemaVersion < 1) {
-        migration.deleteData(DodiesPoint.className())
+        migration.deleteData(forType: DodiesPoint.className())
       }
     })