From ae8e47137f5d1d064d69e892305a2ac8dacfa103 Mon Sep 17 00:00:00 2001 From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com> Date: Fri, 8 Dec 2023 11:02:46 +0000 Subject: [PATCH] chore: set only ci to bump build --- apps/wallet-mobile/android/app/build.gradle | 2 +- apps/wallet-mobile/fastlane/Fastfile | 28 ++++++++----- apps/wallet-mobile/ios/nightly.plist | 4 +- .../ios/yoroi.xcodeproj/project.pbxproj | 39 +++++++++++++++---- apps/wallet-mobile/ios/yoroi/Info.plist | 4 +- apps/wallet-mobile/ios/yoroiTests/Info.plist | 4 +- 6 files changed, 56 insertions(+), 25 deletions(-) diff --git a/apps/wallet-mobile/android/app/build.gradle b/apps/wallet-mobile/android/app/build.gradle index 89b6ca4f08..96a3b0ccf4 100644 --- a/apps/wallet-mobile/android/app/build.gradle +++ b/apps/wallet-mobile/android/app/build.gradle @@ -109,7 +109,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 606 - versionName "4.23.0" + versionName "4.24.0" testBuildType System.getProperty('testBuildType', 'debug') testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } diff --git a/apps/wallet-mobile/fastlane/Fastfile b/apps/wallet-mobile/fastlane/Fastfile index 474d3714fb..54977df884 100644 --- a/apps/wallet-mobile/fastlane/Fastfile +++ b/apps/wallet-mobile/fastlane/Fastfile @@ -23,14 +23,16 @@ platform :ios do environment = lane_context[SharedValues::ENVIRONMENT] scheme = environment == "nightly" ? "nightly" : "yoroi" - create_keychain( - name: ENV["CI_KEYCHAIN_NAME"], - password: ENV["CI_KEYCHAIN_PASSWORD"], - default_keychain: true, - unlock: true, - timeout: 3600, - lock_when_sleeps: false - ) + if is_ci + create_keychain( + name: ENV["CI_KEYCHAIN_NAME"], + password: ENV["CI_KEYCHAIN_PASSWORD"], + default_keychain: true, + unlock: true, + timeout: 3600, + lock_when_sleeps: false + ) + end api_key = app_store_connect_api_key( key_id: ENV["APP_STORE_KEY_ID"], @@ -43,7 +45,10 @@ platform :ios do match(app_identifier: ENV["APP_STORE_BUNDLE_ID"], type: "appstore", api_key: api_key, keychain_name: ENV["CI_KEYCHAIN_NAME"], keychain_password: ENV["CI_KEYCHAIN_PASSWORD"]) set_version_ios - bump_build_ios + + if is_ci + bump_build_ios + end update_code_signing_settings( use_automatic_signing: false, @@ -102,9 +107,12 @@ platform :android do gradle(task: "clean", project_dir: 'android/') - bump_build_android set_version_android + if is_ci + bump_build_android + end + gradle( task: "assemble" + build_type, build_type: "Release", diff --git a/apps/wallet-mobile/ios/nightly.plist b/apps/wallet-mobile/ios/nightly.plist index 890cd50b26..98118e16b8 100644 --- a/apps/wallet-mobile/ios/nightly.plist +++ b/apps/wallet-mobile/ios/nightly.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.23.0 + 4.24.0 CFBundleSignature ???? CFBundleVersion - 494 + 495 LSApplicationCategoryType LSRequiresIPhoneOS diff --git a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj index d54a752a04..d307de0e2f 100644 --- a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj +++ b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj @@ -366,10 +366,15 @@ TargetAttributes = { 00E356ED1AD99517003FC87E = { CreatedOnToolsVersion = 6.2; + ProvisioningStyle = Automatic; TestTargetID = 13B07F861A680F5B00A75B9A; }; 13B07F861A680F5B00A75B9A = { LastSwiftMigration = 1120; + ProvisioningStyle = Automatic; + }; + BD60BE622A34B13000EFF020 = { + ProvisioningStyle = Automatic; }; }; }; @@ -743,6 +748,8 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_IDENTITY = "iPhone Distribution"; + CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = F8NVT2G2L4; ENVFILE = "$(PODS_ROOT)/../../.env"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -766,8 +773,9 @@ "$(inherited)", ); OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; - PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_BUNDLE_IDENTIFIER = com.emurgo.yoroi; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.emurgo.yoroi"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; @@ -782,6 +790,8 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_IDENTITY = "iPhone Distribution"; + CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; DEVELOPMENT_TEAM = F8NVT2G2L4; ENVFILE = "$(PODS_ROOT)/../../.env"; @@ -802,8 +812,9 @@ "$(inherited)", ); OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; - PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_BUNDLE_IDENTIFIER = com.emurgo.yoroi; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.emurgo.yoroi"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; @@ -818,7 +829,9 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 494; + CODE_SIGN_IDENTITY = "iPhone Distribution"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 495; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; ENVFILE = "$(PODS_ROOT)/../../.env"; @@ -841,6 +854,7 @@ OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = com.emurgo.yoroi; PRODUCT_NAME = yoroi; + PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.emurgo.yoroi"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; @@ -857,7 +871,9 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 494; + CODE_SIGN_IDENTITY = "iPhone Distribution"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 495; DEVELOPMENT_TEAM = F8NVT2G2L4; ENVFILE = "$(PODS_ROOT)/../../.env.production"; INFOPLIST_FILE = yoroi/Info.plist; @@ -879,6 +895,7 @@ OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; PRODUCT_BUNDLE_IDENTIFIER = com.emurgo.yoroi; PRODUCT_NAME = yoroi; + PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.emurgo.yoroi"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; @@ -1046,7 +1063,9 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-nightly"; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 494; + CODE_SIGN_IDENTITY = "iPhone Distribution"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 495; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; ENVFILE = "$(PODS_ROOT)/../../.env.nightly"; @@ -1067,8 +1086,9 @@ "-lc++", ); OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; - PRODUCT_BUNDLE_IDENTIFIER = "com.emurgo.yoroi-nightly"; + PRODUCT_BUNDLE_IDENTIFIER = com.emurgo.yoroi; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.emurgo.yoroi"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; @@ -1085,7 +1105,9 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-nightly"; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 494; + CODE_SIGN_IDENTITY = "iPhone Distribution"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 495; DEVELOPMENT_TEAM = F8NVT2G2L4; ENVFILE = "$(PODS_ROOT)/../../.env.nightly"; INFOPLIST_FILE = nightly.plist; @@ -1105,8 +1127,9 @@ "-lc++", ); OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; - PRODUCT_BUNDLE_IDENTIFIER = "com.emurgo.yoroi-nightly"; + PRODUCT_BUNDLE_IDENTIFIER = com.emurgo.yoroi; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.emurgo.yoroi"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; diff --git a/apps/wallet-mobile/ios/yoroi/Info.plist b/apps/wallet-mobile/ios/yoroi/Info.plist index 00e1d89421..099a7401ec 100644 --- a/apps/wallet-mobile/ios/yoroi/Info.plist +++ b/apps/wallet-mobile/ios/yoroi/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.23.0 + 4.24.0 CFBundleSignature ???? CFBundleVersion - 494 + 495 LSApplicationCategoryType LSRequiresIPhoneOS diff --git a/apps/wallet-mobile/ios/yoroiTests/Info.plist b/apps/wallet-mobile/ios/yoroiTests/Info.plist index fc36d2ea81..d8201e16c8 100644 --- a/apps/wallet-mobile/ios/yoroiTests/Info.plist +++ b/apps/wallet-mobile/ios/yoroiTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 4.23.0 + 4.24.0 CFBundleSignature ???? CFBundleVersion - 494 + 495