Skip to content

Commit

Permalink
Merge pull request #81 from fassko/1.5
Browse files Browse the repository at this point in the history
1.5
  • Loading branch information
fassko authored Nov 5, 2016
2 parents fd64f5a + 9dcfa92 commit 4f27029
Show file tree
Hide file tree
Showing 9 changed files with 71 additions and 48 deletions.
13 changes: 7 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Binary file modified Appstore.sketch
Binary file not shown.
8 changes: 4 additions & 4 deletions Dodies.lv.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)",
Expand All @@ -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)",
Expand Down
30 changes: 15 additions & 15 deletions Dodies.lv/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion Dodies.lv/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>52</string>
<string>20161105.153542</string>
<key>Fabric</key>
<dict>
<key>APIKey</key>
Expand Down
24 changes: 16 additions & 8 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ default_platform :ios

platform :ios do
before_all do
cocoapods
# cocoapods
end

desc "Runs all the tests"
Expand All @@ -13,7 +13,6 @@ platform :ios do

desc "Certs"
lane :certificates do
match(type: "adhoc")
match(type: "appstore")
match(type: "development")
end
Expand Down Expand Up @@ -68,19 +67,24 @@ 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"
desc "This will also make sure the profile is up to date"
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",
Expand Down Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions fastlane/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions fastlane/metadata/en-US/release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Uzlabota lietotāja saskarne:
* uzlabots kartes dizains
* navigācija ar Apple Maps, Google Maps un Waze
* taku attēli
Kļūdu labojumi.

Paldies, ka izmantojat Dodies.lv mobilo lietotni!
30 changes: 20 additions & 10 deletions fastlane/report.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,52 +3,62 @@
<testsuite name="fastlane.lanes">


<testcase classname="fastlane.lanes" name="0: update_fastlane" time="6.435868">
<testcase classname="fastlane.lanes" name="0: update_fastlane" time="2.094125">

</testcase>


<testcase classname="fastlane.lanes" name="1: default_platform" time="0.000319">
<testcase classname="fastlane.lanes" name="1: default_platform" time="0.00025">

</testcase>


<testcase classname="fastlane.lanes" name="2: cocoapods" time="18.990132">
<testcase classname="fastlane.lanes" name="2: Switch to ios certificates lane" time="0.000268">

</testcase>


<testcase classname="fastlane.lanes" name="3: cert" time="6.545233">
<testcase classname="fastlane.lanes" name="3: match" time="16.629442">

</testcase>


<testcase classname="fastlane.lanes" name="4: sigh" time="6.758765">
<testcase classname="fastlane.lanes" name="4: match" time="9.762238">

</testcase>


<testcase classname="fastlane.lanes" name="5: increment_build_number" time="2.813324">
<testcase classname="fastlane.lanes" name="5: sigh" time="10.926113">

</testcase>


<testcase classname="fastlane.lanes" name="6: gym" time="278.180553">
<testcase classname="fastlane.lanes" name="6: increment_build_number" time="2.50268">

</testcase>


<testcase classname="fastlane.lanes" name="7: dsym_zip" time="0.087138">
<testcase classname="fastlane.lanes" name="7: clear_derived_data" time="2.086462">

</testcase>


<testcase classname="fastlane.lanes" name="8: copy_artifacts" time="0.172959">
<testcase classname="fastlane.lanes" name="8: gym" time="475.989231">

</testcase>


<testcase classname="fastlane.lanes" name="9: deliver" time="148.830844">
<testcase classname="fastlane.lanes" name="9: dsym_zip" time="0.096977">

</testcase>


<testcase classname="fastlane.lanes" name="10: copy_artifacts" time="0.111856">

</testcase>


<testcase classname="fastlane.lanes" name="11: deliver" time="430.974245">

</testcase>

Expand Down

0 comments on commit 4f27029

Please sign in to comment.