diff --git a/.travis.yml b/.travis.yml index e987ed8..e2646d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,14 @@ before_install: - - gem update cocoapods --no-document --pre + - echo -e "machine bitbucket.org\n login fassko\n password $CI_USER_PASSWORD" >> ~/.netrc + # - gem update cocoapods --no-document --pre - gem update fastlane --no-document - fastlane --version - - gem cleanup - - brew outdated xctool || brew upgrade xctool - - pod --version - - pod repo update --silent + # - gem cleanup + # - brew outdated xctool || brew upgrade xctool + # - pod --version + # - pod repo update --silent language: objective-c osx_image: xcode8 script: - - fastlane travis + - fastlane travis --verbose notifications: change \ No newline at end of file diff --git a/Appstore.sketch b/Appstore.sketch index b75f0dc..4fccb39 100644 Binary files a/Appstore.sketch and b/Appstore.sketch differ diff --git a/Dodies.lv.xcodeproj/project.pbxproj b/Dodies.lv.xcodeproj/project.pbxproj index 53d128f..74404af 100644 --- a/Dodies.lv.xcodeproj/project.pbxproj +++ b/Dodies.lv.xcodeproj/project.pbxproj @@ -563,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 = 52; + CURRENT_PROJECT_VERSION = 20161105.153542; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -617,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 = 52; + CURRENT_PROJECT_VERSION = 20161105.153542; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; @@ -650,7 +650,7 @@ 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"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Kristaps Grinbergs (MMGQCA8E72)"; DEVELOPMENT_TEAM = 3SGNZQGS68; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -674,7 +674,7 @@ 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"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Kristaps Grinbergs (3SGNZQGS68)"; DEVELOPMENT_TEAM = 3SGNZQGS68; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", diff --git a/Dodies.lv/AppDelegate.swift b/Dodies.lv/AppDelegate.swift index 12dae17..c7a1988 100644 --- a/Dodies.lv/AppDelegate.swift +++ b/Dodies.lv/AppDelegate.swift @@ -17,6 +17,21 @@ import RealmSwift class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? + + func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool { + Realm.Configuration.defaultConfiguration = Realm.Configuration( + schemaVersion: 1, + migrationBlock: { migration, oldSchemaVersion in + + if (oldSchemaVersion < 1) { + migration.deleteData(forType: DodiesPoint.className()) + } + }) + + let realm = try! Realm() + + return true + } private func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool { @@ -38,21 +53,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate { UIApplication.shared.statusBarStyle = .lightContent UINavigationBar.appearance().barStyle = .black - let config = Realm.Configuration( - schemaVersion: 1, - - - migrationBlock: { migration, oldSchemaVersion in - - if (oldSchemaVersion < 1) { - migration.deleteData(forType: DodiesPoint.className()) - } - }) - - Realm.Configuration.defaultConfiguration = config - - let realm = try! Realm() - return true } diff --git a/Dodies.lv/Info.plist b/Dodies.lv/Info.plist index a983a6b..5f7d28d 100644 --- a/Dodies.lv/Info.plist +++ b/Dodies.lv/Info.plist @@ -23,7 +23,7 @@ CFBundleSignature ???? CFBundleVersion - 52 + 20161105.153542 Fabric APIKey diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 4e0af49..060b9a6 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -3,7 +3,7 @@ default_platform :ios platform :ios do before_all do - cocoapods + # cocoapods end desc "Runs all the tests" @@ -13,7 +13,6 @@ platform :ios do desc "Certs" lane :certificates do - match(type: "adhoc") match(type: "appstore") match(type: "development") end @@ -68,7 +67,8 @@ platform :ios do clean: true, output_name: "Dodies.lv.ipa", verbose: true, - toolchain: "com.apple.dt.toolchain.Swift_3_0") + toolchain: "com.apple.dt.toolchain.Swift_3_0", + configuration: "Debug") end desc "Submit a new Beta Build to Apple TestFlight" @@ -76,11 +76,15 @@ platform :ios do lane :beta do # match(type: "appstore") # more information: https://codesigning.guide - cert + certificates sigh + + increment_build_number( + build_number: Time.new.strftime("%Y%m%d.%H%M%S") + ) - increment_build_number - + clear_derived_data + gym( workspace: "Dodies.lv.xcworkspace", scheme: "Dodies.lv", @@ -110,10 +114,14 @@ platform :ios do end lane :release do - cert + certificates sigh + + increment_build_number( + build_number: Time.new.strftime("%Y%m%d.%H%M%S") + ) - increment_build_number + clear_derived_data gym( workspace: "Dodies.lv.xcworkspace", diff --git a/fastlane/README.md b/fastlane/README.md index f3b0d95..b450f52 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -11,6 +11,11 @@ sudo gem install fastlane fastlane ios test ``` Runs all the tests +### ios certificates +``` +fastlane ios certificates +``` +Certs ### ios travis ``` fastlane ios travis diff --git a/fastlane/metadata/en-US/release_notes.txt b/fastlane/metadata/en-US/release_notes.txt index c0637b7..a3cdde4 100644 --- a/fastlane/metadata/en-US/release_notes.txt +++ b/fastlane/metadata/en-US/release_notes.txt @@ -1,4 +1,3 @@ -Uzlabota lietotāja saskarne: -* uzlabots kartes dizains -* navigācija ar Apple Maps, Google Maps un Waze -* taku attēli \ No newline at end of file +Kļūdu labojumi. + +Paldies, ka izmantojat Dodies.lv mobilo lietotni! \ No newline at end of file diff --git a/fastlane/report.xml b/fastlane/report.xml index ab03e70..15b7d78 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -3,52 +3,62 @@ - + - + - + - + - + - + - + - + - + - + + + + + + + + + + +