From 28b895b205e974b0f38a3561782f4aa673939904 Mon Sep 17 00:00:00 2001 From: manhlx Date: Wed, 24 Apr 2019 23:39:27 +0700 Subject: [PATCH] Update release branch info --- .../Environments/Sources/KNEnvironment.swift | 2 +- .../KNSplashScreenViewController.swift | 3 +-- .../KNLandingPageViewController.swift | 2 +- fastlane/Fastfile | 24 +++++++++---------- fastlane/README.md | 8 +++++++ 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/KyberNetwork/KyberNetwork/Configurations/Environments/Sources/KNEnvironment.swift b/KyberNetwork/KyberNetwork/Configurations/Environments/Sources/KNEnvironment.swift index 3298afa94e..e79e323237 100644 --- a/KyberNetwork/KyberNetwork/Configurations/Environments/Sources/KNEnvironment.swift +++ b/KyberNetwork/KyberNetwork/Configurations/Environments/Sources/KNEnvironment.swift @@ -42,7 +42,7 @@ enum KNEnvironment: Int { }() static var `default`: KNEnvironment { - return KNAppTracker.externalEnvironment() + return .production//KNAppTracker.externalEnvironment() } var isMainnet: Bool { diff --git a/KyberNetwork/KyberNetwork/Screens/Splash/Controller/KNSplashScreenViewController.swift b/KyberNetwork/KyberNetwork/Screens/Splash/Controller/KNSplashScreenViewController.swift index 6ce30c0bb1..d07351879c 100644 --- a/KyberNetwork/KyberNetwork/Screens/Splash/Controller/KNSplashScreenViewController.swift +++ b/KyberNetwork/KyberNetwork/Screens/Splash/Controller/KNSplashScreenViewController.swift @@ -12,8 +12,7 @@ class KNSplashScreenViewController: KNBaseViewController { override func viewDidLoad() { super.viewDidLoad() self.view.applyGradient(with: UIColor.Kyber.backgroundColors) - //TODO: Remove in prod build - //self.debugInfoView.isHidden = isDebug + self.debugInfoView.isHidden = true self.versionLabel.text = "Version: \(Bundle.main.versionNumber ?? "")" self.networkLabel.text = "Network: \(KNEnvironment.default.displayName)" self.splashLogoImageView.image = nil diff --git a/KyberNetwork/KyberNetwork/Screens/Wallet/LandingPage/Controller/KNLandingPageViewController.swift b/KyberNetwork/KyberNetwork/Screens/Wallet/LandingPage/Controller/KNLandingPageViewController.swift index beb61b2bab..c4e79d6011 100644 --- a/KyberNetwork/KyberNetwork/Screens/Wallet/LandingPage/Controller/KNLandingPageViewController.swift +++ b/KyberNetwork/KyberNetwork/Screens/Wallet/LandingPage/Controller/KNLandingPageViewController.swift @@ -69,7 +69,7 @@ class KNLandingPageViewController: KNBaseViewController { ) self.termAndConditionButton.setTitleColor(.white, for: .normal) self.termAndConditionButton.addTextSpacing() - self.debugButton.isHidden = false + self.debugButton.isHidden = true } override func viewDidLayoutSubviews() { diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 2ed40f4d80..0ad326f2c8 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -34,7 +34,7 @@ platform :ios do desc "Increase build number" lane :increase_build do - ensure_git_branch(branch: "develop") + ensure_git_branch(branch: "release") ensure_git_status_clean git_pull increment_build_number() @@ -44,8 +44,8 @@ platform :ios do git_commit(path: ["./*.plist", "KyberNetwork.xcodeproj/project.pbxproj"], message: "Increase build number " + build_number + " version " + version_number) push_to_git_remote( remote: "origin", - local_branch: "develop", - remote_branch: "develop", + local_branch: "release", + remote_branch: "release", tags: false ) @@ -53,7 +53,7 @@ platform :ios do desc "Increase version and build number" lane :increase_version do - ensure_git_branch(branch: "develop") + ensure_git_branch(branch: "release") ensure_git_status_clean git_pull increment_build_number() @@ -64,8 +64,8 @@ platform :ios do git_commit(path: ["./*.plist", "KyberNetwork.xcodeproj/project.pbxproj"], message: "Increase version and build number " + build_number + " version " + version_number) push_to_git_remote( remote: "origin", - local_branch: "develop", - remote_branch: "develop", + local_branch: "release", + remote_branch: "release", tags: false ) @@ -73,7 +73,7 @@ platform :ios do desc "TestFlight deployment to itunes connect" lane :beta do - ensure_git_branch(branch: "develop") + ensure_git_branch(branch: "release") ensure_git_status_clean git_pull cocoapods(use_bundle_exec: false) @@ -101,15 +101,15 @@ platform :ios do git_commit(path: ["./*.plist", "KyberNetwork.xcodeproj/project.pbxproj"], message: "Increase build number " + build_number + " version " + version_number) push_to_git_remote( remote: "origin", - local_branch: "develop", - remote_branch: "develop", + local_branch: "release", + remote_branch: "release", tags: false ) end desc "Upload current build to TestFlight" lane :upload_testflight do - ensure_git_branch(branch: "develop") + ensure_git_branch(branch: "release") ensure_git_status_clean old_build_number = get_build_number(xcodeproj: "KyberNetwork.xcodeproj") notification(subtitle: "Built Successfully!", message: "Start uploading build " + old_build_number + " to TestFlight.") @@ -124,8 +124,8 @@ platform :ios do git_commit(path: ["./*.plist", "KyberNetwork.xcodeproj/project.pbxproj"], message: "Increase build number " + build_number + " version " + version_number) push_to_git_remote( remote: "origin", - local_branch: "develop", - remote_branch: "develop", + local_branch: "release", + remote_branch: "release", tags: false ) end diff --git a/fastlane/README.md b/fastlane/README.md index 10edef9797..54a3e35246 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -36,6 +36,14 @@ Increase version and build number fastlane ios beta ``` TestFlight deployment to itunes connect + +### ios upload_testflight + +``` +fastlane ios upload_testflight +``` +Upload current build to TestFlight + ### ios release ``` fastlane ios release