fwtoolkit 2.3.6 → 2.6.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6d6d6d97a20ba7540e5850cc43d7b8fa4bb067908ce6cbf9f1db21ccf55b8ea0
4
- data.tar.gz: 68b385672f56c65871d9c81ee0c2a80b9cfecc0181ef8f047ebf39126ee31269
3
+ metadata.gz: 51eb52202a8342b76868cbec800c6206fc16c1083df3043f609bfebc7fdcd942
4
+ data.tar.gz: b581c1438eebf833d627a27d570fc8f3babcb73236661a27636f20e1f040a4e2
5
5
  SHA512:
6
- metadata.gz: 7a3bc4ab9bfdbaada53fc2e79c428bf83334a764d4e5313326bed887c574ae0d0a8d28ebd5ed21233305d977cad3806bc45309a597cc73a63a3f32bae72411c0
7
- data.tar.gz: e48dc7723f29f879cb6606c56e04a0ae529f4fd9c371adf20417efc3f56d0ea3005997ca4be98ef747555e3b585602655aba9b96975f206ed1c9b4e9f3d041d6
6
+ metadata.gz: 3ec12927cbbfe8399632bfa58480366fad8f07d8713f97ec95ec94d588046b7f372062f242dcf61f6830b5f738a913bfdb4a2151352c394c50c50e42be07b93b
7
+ data.tar.gz: e9d62057ebf2005ceecbe8639c32022872714cd37825de0ce5b20a27b67cc91955d167331de9b6f638d496be1010eda5b3a2dcb3796311b7c85e35c5edefc812
@@ -19,7 +19,7 @@ Feature: Create new project
19
19
  And the following files should exist:
20
20
  | MyProject/MyProject/AAAAppDelegate.h |
21
21
  | MyProject/MyProject/AAAAppDelegate.m |
22
- | MyProject/MyProject.entitlements |
22
+ | MyProject/MyProject/Supporting Files/MyProject.entitlements |
23
23
  | MyProject/MyProject/Supporting Files/Info.plist |
24
24
  | MyProject/MyProject/Supporting Files/fw-shared.xcconfig |
25
25
  | MyProject/MyProject/Supporting Files/main.m |
@@ -12,17 +12,37 @@ module FWToolkit
12
12
 
13
13
  source_root_templates!
14
14
 
15
- desc 'genereate [PROJECT NAME]', "Create a new bitrise.yml file for the project, based on a blank file"
16
- def generate(project_name)
15
+ desc 'genereate [PROJECT NAME] [PLATFORM]', "Create a new bitrise.yml file for the project, based on a blank file. Platform needs to be either ios or android. ios is used by default"
16
+ def generate(project_name, platform='ios')
17
17
  destination_root = Dir.pwd
18
18
 
19
- say "Creating bitrise.yml file in: #{File.expand_path destination_root}/bitrise.yml"
19
+ if platform == 'android'
20
+ invoke FWToolkit::Bitrise, 'android', [destination_root, project_name]
21
+ else
22
+ invoke FWToolkit::Bitrise, 'ios', [destination_root, project_name]
23
+ end
24
+ end
25
+
26
+ desc 'android [PROJECT ROOT PATH] [PACKAGE_NAME]', 'Creates a new Android bitrise YML configuration file'
27
+ def android(project_root, package_name)
28
+ say "Creating android bitrise.yml file in: #{File.expand_path project_root}/bitrise.yml"
29
+ destination_root = project_root
30
+ bitrise_file = File.join(project_root, 'bitrise.yml')
31
+
32
+ Projectfile.load_with_config! :project_name => package_name
33
+
34
+ template_config = { :target_platform => Config.target_platform,
35
+ :organization_name => Config.organization_name,
36
+ :project_creator => Config.developer_name,
37
+ :package_name => package_name }
38
+ template_config.merge! Projectfile.config
20
39
 
21
- invoke FWToolkit::Bitrise, 'new', [destination_root, project_name]
40
+ template_directory "templates/bitrise/android", destination_root, template_config
22
41
  end
23
42
 
24
- desc 'new', 'Creates a new bitrise YML configuration file'
25
- def new(project_root, project_name)
43
+ desc 'ios [PROJECT ROOT PATH] [PROJECT NAME]', 'Creates a new iOS bitrise YML configuration file'
44
+ def ios(project_root, project_name)
45
+ say "Creating ios bitrise.yml file in: #{File.expand_path project_root}/bitrise.yml"
26
46
  destination_root = project_root
27
47
  bitrise_file = File.join(project_root, 'bitrise.yml')
28
48
 
@@ -33,7 +53,7 @@ module FWToolkit
33
53
  :project_creator => Config.developer_name }
34
54
  template_config.merge! Projectfile.config
35
55
 
36
- template_directory "templates/bitrise", destination_root, template_config
56
+ template_directory "templates/bitrise/ios", destination_root, template_config
37
57
  end
38
58
 
39
59
  end
@@ -40,7 +40,7 @@ module FWToolkit
40
40
 
41
41
  invoke :conf_gemset, [destination_root]
42
42
 
43
- invoke FWToolkit::Bitrise, 'new', [destination_root, clean_project_name]
43
+ invoke FWToolkit::Bitrise, 'ios', [destination_root, clean_project_name]
44
44
 
45
45
  invoke FWToolkit::Xcode, 'new', [project_language, clean_project_name, class_prefix.upcase, File.join(Dir.pwd, clean_project_name)]
46
46
  invoke FWToolkit::Cocoapods, 'install', [destination_root]
@@ -1,3 +1,3 @@
1
1
  module FWToolkit
2
- VERSION = "2.3.6"
2
+ VERSION = "2.6.1"
3
3
  end
Binary file
@@ -0,0 +1,175 @@
1
+ ---
2
+ format_version: '8'
3
+ default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
4
+ project_type: android
5
+ trigger_map:
6
+ - push_branch: dev
7
+ workflow: staging
8
+ - push_branch: release/next
9
+ workflow: test_external
10
+ - push_branch: main
11
+ workflow: external
12
+ - pull_request_source_branch: "*"
13
+ workflow: pull_request
14
+ workflows:
15
+ pull_request:
16
+ envs:
17
+ - BUILD_FLAVOUR:
18
+ opts:
19
+ is_expand: true
20
+ - BUILD_TASK: Debug
21
+ opts:
22
+ is_expand: true
23
+ after_run:
24
+ - _preflight
25
+ - _test
26
+ - _commit_status
27
+ staging:
28
+ envs:
29
+ - KEYSTORE_NAME: fw_internal.keystore
30
+ opts:
31
+ is_expand: true
32
+ - KEYSTORE_ALIAS: Allinternal
33
+ opts:
34
+ is_expand: true
35
+ - PACKAGE_NAME: com.futureworkshops.<%= config[:package_name] %>
36
+ - KEYSTORE_PASSWORD: "$INTERNAL_KEYSTORE_PASSWORD"
37
+ - KEYALIAS_PASSWORD: "$INTERNAL_KEYALIAS_PASSWORD"
38
+ after_run:
39
+ - _preflight
40
+ - _build
41
+ - _deploy_bitrise
42
+ external:
43
+ envs:
44
+ - KEYSTORE_NAME:
45
+ opts:
46
+ is_expand: true
47
+ - KEYSTORE_ALIAS:
48
+ opts:
49
+ is_expand: true
50
+ - PACKAGE_NAME: <%= config[:package_name] %>
51
+ - KEYSTORE_PASSWORD:
52
+ - KEYALIAS_PASSWORD:
53
+ after_run:
54
+ - _preflight
55
+ - _build
56
+ - _deploy_bitrise
57
+ - _deploy_google
58
+ test_external:
59
+ envs:
60
+ - KEYSTORE_NAME:
61
+ opts:
62
+ is_expand: true
63
+ - KEYSTORE_ALIAS:
64
+ opts:
65
+ is_expand: true
66
+ - PACKAGE_NAME: com.futureworkshops.<%= config[:package_name] %>
67
+ - KEYSTORE_PASSWORD:
68
+ - KEYALIAS_PASSWORD:
69
+ after_run:
70
+ - _preflight
71
+ - _build
72
+ - _deploy_bitrise
73
+ - _deploy_google
74
+ _build:
75
+ steps:
76
+ - s3-download@1:
77
+ title: Download keystore
78
+ inputs:
79
+ - aws_access_key: "$AWS_ACCESS_KEY_ID"
80
+ - aws_secret_access_key: "$AWS_SECRET_ACCESS_KEY"
81
+ - s3_bucket: fw.ci.certificates
82
+ - output_location: "$KEYSTORE_OUTPUT_PATH"
83
+ - s3_filepath: "$KEYSTORE_NAME"
84
+ - gradle-runner@1.9:
85
+ inputs:
86
+ - gradle_file: "$GRADLE_BUILD_FILE_PATH"
87
+ - gradle_task: "-Pproject.buildnumber=$BITRISE_BUILD_NUMBER -Pproject.buildversion=$BUILD_VERSION
88
+ -Pproject.bundleId=$PACKAGE_NAME bundle$BUILD_FLAVOUR$BUILD_TASK"
89
+ - app_file_include_filter: |
90
+ *-universal-*.apk
91
+ *.aab
92
+ - gradlew_path: "$GRADLEW_PATH"
93
+ - bitrise-step-export-universal-apk@0:
94
+ inputs:
95
+ - keystore_alias: "$KEYSTORE_ALIAS"
96
+ - private_key_password: "$KEYALIAS_PASSWORD"
97
+ - keystore_url: file://$S3_DOWNLOAD_OUTPUT_PATH
98
+ - keystore_password: "$KEYSTORE_PASSWORD"
99
+ envs:
100
+ - KEYSTORE_PATH: "$KEYSTORE_OUTPUT_PATH/$KEYSTORE_NAME"
101
+ _deploy_bitrise:
102
+ steps:
103
+ - deploy-to-bitrise-io@1.12:
104
+ inputs:
105
+ - generate_universal_apk_if_none: 'false'
106
+ _deploy_google:
107
+ steps:
108
+ - google-play-deploy@3.3:
109
+ inputs:
110
+ - service_account_json_key_path: "$BITRISEIO_GOOGLE_PLAY_JSON_AUTH_PATH_URL"
111
+ - package_name: "$PACKAGE_NAME"
112
+ - mapping_file: ''
113
+ - track: internal
114
+ - app_path: "$BITRISE_AAB_PATH"
115
+ _preflight:
116
+ steps:
117
+ - build-number-adjust@1.0.0:
118
+ inputs:
119
+ - change: ''
120
+ - increase: "$FW_BUILD_NUMBER_OFFSET"
121
+ - decrease: ''
122
+ - activate-ssh-key@4.0.5:
123
+ run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
124
+ - git-clone@4.0:
125
+ inputs:
126
+ - manual_merge: 'no'
127
+ - install-missing-android-tools@2.3.8:
128
+ inputs:
129
+ - ndk_revision: $ANDROID_NDK_VERSION
130
+ _test:
131
+ steps:
132
+ - gradle-unit-test@1.0:
133
+ inputs:
134
+ - unit_test_task: "$TEST_COMMAND"
135
+ - unit_test_flags:
136
+ - deploy-to-bitrise-io@1.12:
137
+ inputs:
138
+ - deploy_path: "$TEST_REPORTS_PATH"
139
+ - notify_user_groups: none
140
+ - is_compress: 'true'
141
+ envs:
142
+ - TEST_REPORTS_PATH: "$BITRISE_SOURCE_DIR/app/build/reports/"
143
+ - TEST_COMMAND: check test
144
+ _commit_status:
145
+ steps:
146
+ - github-status@2.3:
147
+ inputs:
148
+ - auth_token: "$FW_GITHUB_STATUS_AUTH_TOKEN"
149
+ app:
150
+ envs:
151
+ - BUILD_FLAVOUR:
152
+ opts:
153
+ is_expand: true
154
+ - BUILD_TASK: Release
155
+ opts:
156
+ is_expand: true
157
+ - GRADLE_BUILD_FILE_PATH: app/build.gradle
158
+ opts:
159
+ is_expand: true
160
+ - GRADLEW_PATH: "./gradlew"
161
+ opts:
162
+ is_expand: true
163
+ - FW_BUILD_NUMBER_OFFSET: '0'
164
+ opts:
165
+ is_expand: true
166
+ - BUILD_VERSION: 1.0.0
167
+ opts:
168
+ is_expand: true
169
+ - ANDROID_NDK_VERSION: '21'
170
+ opts:
171
+ is_expand: true
172
+ - KEYSTORE_OUTPUT_PATH: "$BITRISE_SOURCE_DIR"
173
+ meta:
174
+ bitrise.io:
175
+ machine_type: performance
@@ -6,7 +6,7 @@ trigger_map:
6
6
  workflow: internal
7
7
  - push_branch: release/next
8
8
  workflow: test_external
9
- - push_branch: master
9
+ - push_branch: main
10
10
  workflow: external
11
11
  - pull_request_source_branch: "*"
12
12
  workflow: test
@@ -189,17 +189,6 @@ workflows:
189
189
  - plist_path: "$FW_PROJECT_DIR/$INFO_PLIST_PATH"
190
190
  - build_version_offset: ''
191
191
  - build_short_version_string: "$VERSION_NUMBER"
192
- - git::https://github.com/FutureWorkshops/bitrise-step-download-provisioning-profile@master:
193
- title: Download provisioning profile
194
- run_if: .IsCI
195
- inputs:
196
- - profile_name: "$PROVISIONING_PROFILE_NAME"
197
- - bundle_id: "$PRODUCT_BUNDLE_IDENTIFIER"
198
- - team_id: "$DEVPORTAL_TEAM"
199
- - portal_username: "$DEVPORTAL_USERNAME"
200
- - portal_password: "$DEVPORTAL_PASSWORD"
201
- - target_variable: BITRISE_PROVISION_URL
202
- - target_filename: profile.mobileprovision
203
192
  - git::https://github.com/FutureWorkshops/bitrise-step-s3-download.git@master:
204
193
  title: Download keychain
205
194
  run_if: .IsCI
@@ -251,7 +240,7 @@ workflows:
251
240
  echo "Final file"
252
241
  pbcopy < "$xconfig"
253
242
  pbpaste
254
- - xcode-archive:
243
+ - xcode-archive@3:
255
244
  inputs:
256
245
  - upload_bitcode: 'no'
257
246
  - compile_bitcode: 'no'
@@ -267,7 +256,7 @@ workflows:
267
256
  - export_method: "$EXPORT_TYPE"
268
257
  - custom_export_options_plist_content: "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE
269
258
  plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist
270
- version=\"1.0\">\n<dict>\n\t<key>method</key>\n\t<string>$EXPORT_TYPE</string>\n\t<key>teamID</key>\n\t<string>$DEVPORTAL_TEAM</string>\n\t<key>thinning</key>\n\t<string>&lt;none&gt;</string>\n\t<key>provisioningProfiles</key>\n\t<dict>\n\t\t<key>$PRODUCT_BUNDLE_IDENTIFIER</key>\n\t\t<string>$PROVISIONING_PROFILE_NAME</string>\n\t</dict>\n</dict>\n</plist>"
259
+ version=\"1.0\">\n<dict>\n\t<key>method</key>\n\t<string>$EXPORT_TYPE</string>\n\t<key>teamID</key>\n\t<string>$DEVPORTAL_TEAM</string>\n\t<key>thinning</key>\n\t<string>&lt;none&gt;</string>\n\t<key>signingStyle</key>\n\t<string>manual</string>\n\t<key>signingCertificate</key>\n\t<string>$CODESIGN_IDENTITY</string>\n\t<key>provisioningProfiles</key>\n\t<dict>\n\t\t<key>$PRODUCT_BUNDLE_IDENTIFIER</key>\n\t\t<string>$PROVISIONING_PROFILE_NAME</string>\n\t</dict>\n</dict>\n</plist>"
271
260
  - git::https://github.com/FutureWorkshops/steps-github-status.git@master:
272
261
  title: Git Hub status
273
262
  run_if: .IsCI
@@ -285,14 +274,20 @@ workflows:
285
274
  - is_enable_public_page: 'false'
286
275
  _deploy_itunes:
287
276
  steps:
288
- - deploy-to-itunesconnect-deliver:
277
+ - git::https://github.com/FutureWorkshops/bitrise-step-s3-download.git@master:
278
+ title: Download API Key
289
279
  run_if: .IsCI
290
280
  inputs:
291
- - itunescon_user: "$ITUNESCONNECT_USERNAME"
292
- - password: "$ITUNESCONNECT_PASSWORD"
293
- - app_id: "$ITUNESCONNECT_APPID"
294
- - team_id: "$ITUNES_TEAM_ID"
295
- - options: ''
281
+ - aws_access_key: "$AWS_ACCESS_KEY_ID"
282
+ - aws_secret_access_key: "$AWS_SECRET_ACCESS_KEY"
283
+ - s3_bucket: fw.ci.certificates
284
+ - output_location: "$BITRISE_SOURCE_DIR"
285
+ - s3_filepath: "$FW_ITUNES_CONNECT_API_KEY"
286
+ - deploy-to-itunesconnect-application-loader@0:
287
+ run_if: .IsCI
288
+ inputs:
289
+ - api_issuer: "$FW_ITUNES_CONNECT_API_KEY_ISSUER_ID"
290
+ - api_key_path: file://$BITRISE_SOURCE_DIR/$FW_ITUNES_CONNECT_API_KEY
296
291
  app:
297
292
  envs:
298
293
  - opts:
@@ -307,9 +302,6 @@ app:
307
302
  - opts:
308
303
  is_expand: true
309
304
  FW_XCODEPROJ_NAME: <%= config[:project_name] %>.xcodeproj
310
- - opts:
311
- is_expand: true
312
- DEVPORTAL_USERNAME: c-i@futureworkshops.com
313
305
  - opts:
314
306
  is_expand: true
315
307
  FW_BUILD_NUMBER_OFFSET: '0'
@@ -0,0 +1,175 @@
1
+ ---
2
+ format_version: '8'
3
+ default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
4
+ project_type: android
5
+ trigger_map:
6
+ - push_branch: dev
7
+ workflow: staging
8
+ - push_branch: release/next
9
+ workflow: test_external
10
+ - push_branch: main
11
+ workflow: external
12
+ - pull_request_source_branch: "*"
13
+ workflow: pull_request
14
+ workflows:
15
+ pull_request:
16
+ envs:
17
+ - BUILD_FLAVOUR:
18
+ opts:
19
+ is_expand: true
20
+ - BUILD_TASK: Debug
21
+ opts:
22
+ is_expand: true
23
+ after_run:
24
+ - _preflight
25
+ - _test
26
+ - _commit_status
27
+ staging:
28
+ envs:
29
+ - KEYSTORE_NAME: fw_internal.keystore
30
+ opts:
31
+ is_expand: true
32
+ - KEYSTORE_ALIAS: Allinternal
33
+ opts:
34
+ is_expand: true
35
+ - PACKAGE_NAME: com.futureworkshops.<%= config[:package_name] %>
36
+ - KEYSTORE_PASSWORD: "$INTERNAL_KEYSTORE_PASSWORD"
37
+ - KEYALIAS_PASSWORD: "$INTERNAL_KEYALIAS_PASSWORD"
38
+ after_run:
39
+ - _preflight
40
+ - _build
41
+ - _deploy_bitrise
42
+ external:
43
+ envs:
44
+ - KEYSTORE_NAME:
45
+ opts:
46
+ is_expand: true
47
+ - KEYSTORE_ALIAS:
48
+ opts:
49
+ is_expand: true
50
+ - PACKAGE_NAME: <%= config[:package_name] %>
51
+ - KEYSTORE_PASSWORD:
52
+ - KEYALIAS_PASSWORD:
53
+ after_run:
54
+ - _preflight
55
+ - _build
56
+ - _deploy_bitrise
57
+ - _deploy_google
58
+ test_external:
59
+ envs:
60
+ - KEYSTORE_NAME:
61
+ opts:
62
+ is_expand: true
63
+ - KEYSTORE_ALIAS:
64
+ opts:
65
+ is_expand: true
66
+ - PACKAGE_NAME: com.futureworkshops.<%= config[:package_name] %>
67
+ - KEYSTORE_PASSWORD:
68
+ - KEYALIAS_PASSWORD:
69
+ after_run:
70
+ - _preflight
71
+ - _build
72
+ - _deploy_bitrise
73
+ - _deploy_google
74
+ _build:
75
+ steps:
76
+ - s3-download@1:
77
+ title: Download keystore
78
+ inputs:
79
+ - aws_access_key: "$AWS_ACCESS_KEY_ID"
80
+ - aws_secret_access_key: "$AWS_SECRET_ACCESS_KEY"
81
+ - s3_bucket: fw.ci.certificates
82
+ - output_location: "$KEYSTORE_OUTPUT_PATH"
83
+ - s3_filepath: "$KEYSTORE_NAME"
84
+ - gradle-runner@1.9:
85
+ inputs:
86
+ - gradle_file: "$GRADLE_BUILD_FILE_PATH"
87
+ - gradle_task: "-Pproject.buildnumber=$BITRISE_BUILD_NUMBER -Pproject.buildversion=$BUILD_VERSION
88
+ -Pproject.bundleId=$PACKAGE_NAME bundle$BUILD_FLAVOUR$BUILD_TASK"
89
+ - app_file_include_filter: |
90
+ *-universal-*.apk
91
+ *.aab
92
+ - gradlew_path: "$GRADLEW_PATH"
93
+ - bitrise-step-export-universal-apk@0:
94
+ inputs:
95
+ - keystore_alias: "$KEYSTORE_ALIAS"
96
+ - private_key_password: "$KEYALIAS_PASSWORD"
97
+ - keystore_url: file://$S3_DOWNLOAD_OUTPUT_PATH
98
+ - keystore_password: "$KEYSTORE_PASSWORD"
99
+ envs:
100
+ - KEYSTORE_PATH: "$KEYSTORE_OUTPUT_PATH/$KEYSTORE_NAME"
101
+ _deploy_bitrise:
102
+ steps:
103
+ - deploy-to-bitrise-io@1.12:
104
+ inputs:
105
+ - generate_universal_apk_if_none: 'false'
106
+ _deploy_google:
107
+ steps:
108
+ - google-play-deploy@3.3:
109
+ inputs:
110
+ - service_account_json_key_path: "$BITRISEIO_GOOGLE_PLAY_JSON_AUTH_PATH_URL"
111
+ - package_name: "$PACKAGE_NAME"
112
+ - mapping_file: ''
113
+ - track: internal
114
+ - app_path: "$BITRISE_AAB_PATH"
115
+ _preflight:
116
+ steps:
117
+ - build-number-adjust@1.0.0:
118
+ inputs:
119
+ - change: ''
120
+ - increase: "$FW_BUILD_NUMBER_OFFSET"
121
+ - decrease: ''
122
+ - activate-ssh-key@4.0.5:
123
+ run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
124
+ - git-clone@4.0:
125
+ inputs:
126
+ - manual_merge: 'no'
127
+ - install-missing-android-tools@2.3.8:
128
+ inputs:
129
+ - ndk_revision: $ANDROID_NDK_VERSION
130
+ _test:
131
+ steps:
132
+ - gradle-unit-test@1.0:
133
+ inputs:
134
+ - unit_test_task: "$TEST_COMMAND"
135
+ - unit_test_flags:
136
+ - deploy-to-bitrise-io@1.12:
137
+ inputs:
138
+ - deploy_path: "$TEST_REPORTS_PATH"
139
+ - notify_user_groups: none
140
+ - is_compress: 'true'
141
+ envs:
142
+ - TEST_REPORTS_PATH: "$BITRISE_SOURCE_DIR/app/build/reports/"
143
+ - TEST_COMMAND: check test
144
+ _commit_status:
145
+ steps:
146
+ - github-status@2.3:
147
+ inputs:
148
+ - auth_token: "$FW_GITHUB_STATUS_AUTH_TOKEN"
149
+ app:
150
+ envs:
151
+ - BUILD_FLAVOUR:
152
+ opts:
153
+ is_expand: true
154
+ - BUILD_TASK: Release
155
+ opts:
156
+ is_expand: true
157
+ - GRADLE_BUILD_FILE_PATH: app/build.gradle
158
+ opts:
159
+ is_expand: true
160
+ - GRADLEW_PATH: "./gradlew"
161
+ opts:
162
+ is_expand: true
163
+ - FW_BUILD_NUMBER_OFFSET: '0'
164
+ opts:
165
+ is_expand: true
166
+ - BUILD_VERSION: 1.0.0
167
+ opts:
168
+ is_expand: true
169
+ - ANDROID_NDK_VERSION: '21'
170
+ opts:
171
+ is_expand: true
172
+ - KEYSTORE_OUTPUT_PATH: "$BITRISE_SOURCE_DIR"
173
+ meta:
174
+ bitrise.io:
175
+ machine_type: performance
@@ -6,7 +6,7 @@ trigger_map:
6
6
  workflow: internal
7
7
  - push_branch: release/next
8
8
  workflow: test_external
9
- - push_branch: master
9
+ - push_branch: main
10
10
  workflow: external
11
11
  - pull_request_source_branch: "*"
12
12
  workflow: test
@@ -189,17 +189,6 @@ workflows:
189
189
  - plist_path: "$FW_PROJECT_DIR/$INFO_PLIST_PATH"
190
190
  - build_version_offset: ''
191
191
  - build_short_version_string: "$VERSION_NUMBER"
192
- - git::https://github.com/FutureWorkshops/bitrise-step-download-provisioning-profile@master:
193
- title: Download provisioning profile
194
- run_if: .IsCI
195
- inputs:
196
- - profile_name: "$PROVISIONING_PROFILE_NAME"
197
- - bundle_id: "$PRODUCT_BUNDLE_IDENTIFIER"
198
- - team_id: "$DEVPORTAL_TEAM"
199
- - portal_username: "$DEVPORTAL_USERNAME"
200
- - portal_password: "$DEVPORTAL_PASSWORD"
201
- - target_variable: BITRISE_PROVISION_URL
202
- - target_filename: profile.mobileprovision
203
192
  - git::https://github.com/FutureWorkshops/bitrise-step-s3-download.git@master:
204
193
  title: Download keychain
205
194
  run_if: .IsCI
@@ -251,7 +240,7 @@ workflows:
251
240
  echo "Final file"
252
241
  pbcopy < "$xconfig"
253
242
  pbpaste
254
- - xcode-archive:
243
+ - xcode-archive@3:
255
244
  inputs:
256
245
  - upload_bitcode: 'no'
257
246
  - compile_bitcode: 'no'
@@ -267,7 +256,7 @@ workflows:
267
256
  - export_method: "$EXPORT_TYPE"
268
257
  - custom_export_options_plist_content: "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE
269
258
  plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist
270
- version=\"1.0\">\n<dict>\n\t<key>method</key>\n\t<string>$EXPORT_TYPE</string>\n\t<key>teamID</key>\n\t<string>$DEVPORTAL_TEAM</string>\n\t<key>thinning</key>\n\t<string>&lt;none&gt;</string>\n\t<key>provisioningProfiles</key>\n\t<dict>\n\t\t<key>$PRODUCT_BUNDLE_IDENTIFIER</key>\n\t\t<string>$PROVISIONING_PROFILE_NAME</string>\n\t</dict>\n</dict>\n</plist>"
259
+ version=\"1.0\">\n<dict>\n\t<key>method</key>\n\t<string>$EXPORT_TYPE</string>\n\t<key>teamID</key>\n\t<string>$DEVPORTAL_TEAM</string>\n\t<key>thinning</key>\n\t<string>&lt;none&gt;</string>\n\t<key>signingStyle</key>\n\t<string>manual</string>\n\t<key>signingCertificate</key>\n\t<string>$CODESIGN_IDENTITY</string>\n\t<key>provisioningProfiles</key>\n\t<dict>\n\t\t<key>$PRODUCT_BUNDLE_IDENTIFIER</key>\n\t\t<string>$PROVISIONING_PROFILE_NAME</string>\n\t</dict>\n</dict>\n</plist>"
271
260
  - git::https://github.com/FutureWorkshops/steps-github-status.git@master:
272
261
  title: Git Hub status
273
262
  run_if: .IsCI
@@ -285,14 +274,20 @@ workflows:
285
274
  - is_enable_public_page: 'false'
286
275
  _deploy_itunes:
287
276
  steps:
288
- - deploy-to-itunesconnect-deliver:
277
+ - git::https://github.com/FutureWorkshops/bitrise-step-s3-download.git@master:
278
+ title: Download API Key
289
279
  run_if: .IsCI
290
280
  inputs:
291
- - itunescon_user: "$ITUNESCONNECT_USERNAME"
292
- - password: "$ITUNESCONNECT_PASSWORD"
293
- - app_id: "$ITUNESCONNECT_APPID"
294
- - team_id: "$ITUNES_TEAM_ID"
295
- - options: ''
281
+ - aws_access_key: "$AWS_ACCESS_KEY_ID"
282
+ - aws_secret_access_key: "$AWS_SECRET_ACCESS_KEY"
283
+ - s3_bucket: fw.ci.certificates
284
+ - output_location: "$BITRISE_SOURCE_DIR"
285
+ - s3_filepath: "$FW_ITUNES_CONNECT_API_KEY"
286
+ - deploy-to-itunesconnect-application-loader@0:
287
+ run_if: .IsCI
288
+ inputs:
289
+ - api_issuer: "$FW_ITUNES_CONNECT_API_KEY_ISSUER_ID"
290
+ - api_key_path: file://$BITRISE_SOURCE_DIR/$FW_ITUNES_CONNECT_API_KEY
296
291
  app:
297
292
  envs:
298
293
  - opts:
@@ -307,9 +302,6 @@ app:
307
302
  - opts:
308
303
  is_expand: true
309
304
  FW_XCODEPROJ_NAME: <%= config[:project_name] %>.xcodeproj
310
- - opts:
311
- is_expand: true
312
- DEVPORTAL_USERNAME: c-i@futureworkshops.com
313
305
  - opts:
314
306
  is_expand: true
315
307
  FW_BUILD_NUMBER_OFFSET: '0'
metadata CHANGED
@@ -1,233 +1,233 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fwtoolkit
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.6
4
+ version: 2.6.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Future Workshops
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-09-25 00:00:00.000000000 Z
11
+ date: 2021-10-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec-rails
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: 3.8.2
20
- - - ">="
20
+ - - "~>"
21
21
  - !ruby/object:Gem::Version
22
22
  version: 3.8.2
23
23
  type: :development
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
- - - "~>"
27
+ - - ">="
28
28
  - !ruby/object:Gem::Version
29
29
  version: 3.8.2
30
- - - ">="
30
+ - - "~>"
31
31
  - !ruby/object:Gem::Version
32
32
  version: 3.8.2
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: aruba
35
35
  requirement: !ruby/object:Gem::Requirement
36
36
  requirements:
37
- - - "~>"
37
+ - - ">="
38
38
  - !ruby/object:Gem::Version
39
39
  version: 0.14.12
40
- - - ">="
40
+ - - "~>"
41
41
  - !ruby/object:Gem::Version
42
42
  version: 0.14.12
43
43
  type: :development
44
44
  prerelease: false
45
45
  version_requirements: !ruby/object:Gem::Requirement
46
46
  requirements:
47
- - - "~>"
47
+ - - ">="
48
48
  - !ruby/object:Gem::Version
49
49
  version: 0.14.12
50
- - - ">="
50
+ - - "~>"
51
51
  - !ruby/object:Gem::Version
52
52
  version: 0.14.12
53
53
  - !ruby/object:Gem::Dependency
54
54
  name: cucumber
55
55
  requirement: !ruby/object:Gem::Requirement
56
56
  requirements:
57
- - - "~>"
57
+ - - ">="
58
58
  - !ruby/object:Gem::Version
59
59
  version: 3.1.2
60
- - - ">="
60
+ - - "~>"
61
61
  - !ruby/object:Gem::Version
62
62
  version: 3.1.2
63
63
  type: :development
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
- - - "~>"
67
+ - - ">="
68
68
  - !ruby/object:Gem::Version
69
69
  version: 3.1.2
70
- - - ">="
70
+ - - "~>"
71
71
  - !ruby/object:Gem::Version
72
72
  version: 3.1.2
73
73
  - !ruby/object:Gem::Dependency
74
74
  name: aruba-doubles
75
75
  requirement: !ruby/object:Gem::Requirement
76
76
  requirements:
77
- - - "~>"
77
+ - - ">="
78
78
  - !ruby/object:Gem::Version
79
79
  version: 1.2.1
80
- - - ">="
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: 1.2.1
83
83
  type: :development
84
84
  prerelease: false
85
85
  version_requirements: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - "~>"
87
+ - - ">="
88
88
  - !ruby/object:Gem::Version
89
89
  version: 1.2.1
90
- - - ">="
90
+ - - "~>"
91
91
  - !ruby/object:Gem::Version
92
92
  version: 1.2.1
93
93
  - !ruby/object:Gem::Dependency
94
94
  name: thor
95
95
  requirement: !ruby/object:Gem::Requirement
96
96
  requirements:
97
- - - "~>"
97
+ - - ">="
98
98
  - !ruby/object:Gem::Version
99
99
  version: 0.20.3
100
- - - ">="
100
+ - - "~>"
101
101
  - !ruby/object:Gem::Version
102
102
  version: 0.20.3
103
103
  type: :runtime
104
104
  prerelease: false
105
105
  version_requirements: !ruby/object:Gem::Requirement
106
106
  requirements:
107
- - - "~>"
107
+ - - ">="
108
108
  - !ruby/object:Gem::Version
109
109
  version: 0.20.3
110
- - - ">="
110
+ - - "~>"
111
111
  - !ruby/object:Gem::Version
112
112
  version: 0.20.3
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: rake
115
115
  requirement: !ruby/object:Gem::Requirement
116
116
  requirements:
117
- - - "~>"
117
+ - - ">="
118
118
  - !ruby/object:Gem::Version
119
119
  version: 13.0.0
120
- - - ">="
120
+ - - "~>"
121
121
  - !ruby/object:Gem::Version
122
122
  version: 13.0.0
123
123
  type: :runtime
124
124
  prerelease: false
125
125
  version_requirements: !ruby/object:Gem::Requirement
126
126
  requirements:
127
- - - "~>"
127
+ - - ">="
128
128
  - !ruby/object:Gem::Version
129
129
  version: 13.0.0
130
- - - ">="
130
+ - - "~>"
131
131
  - !ruby/object:Gem::Version
132
132
  version: 13.0.0
133
133
  - !ruby/object:Gem::Dependency
134
134
  name: bundler
135
135
  requirement: !ruby/object:Gem::Requirement
136
136
  requirements:
137
- - - "~>"
138
- - !ruby/object:Gem::Version
139
- version: 2.1.4
140
137
  - - ">="
141
138
  - !ruby/object:Gem::Version
142
- version: 2.1.4
139
+ version: 2.2.0
140
+ - - "~>"
141
+ - !ruby/object:Gem::Version
142
+ version: 2.2.8
143
143
  type: :runtime
144
144
  prerelease: false
145
145
  version_requirements: !ruby/object:Gem::Requirement
146
146
  requirements:
147
- - - "~>"
148
- - !ruby/object:Gem::Version
149
- version: 2.1.4
150
147
  - - ">="
151
148
  - !ruby/object:Gem::Version
152
- version: 2.1.4
149
+ version: 2.2.0
150
+ - - "~>"
151
+ - !ruby/object:Gem::Version
152
+ version: 2.2.8
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: multi_json
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - "~>"
157
+ - - ">="
158
158
  - !ruby/object:Gem::Version
159
159
  version: 1.13.1
160
- - - ">="
160
+ - - "~>"
161
161
  - !ruby/object:Gem::Version
162
162
  version: 1.13.1
163
163
  type: :runtime
164
164
  prerelease: false
165
165
  version_requirements: !ruby/object:Gem::Requirement
166
166
  requirements:
167
- - - "~>"
167
+ - - ">="
168
168
  - !ruby/object:Gem::Version
169
169
  version: 1.13.1
170
- - - ">="
170
+ - - "~>"
171
171
  - !ruby/object:Gem::Version
172
172
  version: 1.13.1
173
173
  - !ruby/object:Gem::Dependency
174
174
  name: xcodeproj
175
175
  requirement: !ruby/object:Gem::Requirement
176
176
  requirements:
177
- - - "~>"
177
+ - - ">="
178
178
  - !ruby/object:Gem::Version
179
179
  version: 1.12.0
180
- - - ">="
180
+ - - "~>"
181
181
  - !ruby/object:Gem::Version
182
182
  version: 1.12.0
183
183
  type: :runtime
184
184
  prerelease: false
185
185
  version_requirements: !ruby/object:Gem::Requirement
186
186
  requirements:
187
- - - "~>"
187
+ - - ">="
188
188
  - !ruby/object:Gem::Version
189
189
  version: 1.12.0
190
- - - ">="
190
+ - - "~>"
191
191
  - !ruby/object:Gem::Version
192
192
  version: 1.12.0
193
193
  - !ruby/object:Gem::Dependency
194
194
  name: xcodebuild-rb
195
195
  requirement: !ruby/object:Gem::Requirement
196
196
  requirements:
197
- - - "~>"
197
+ - - ">="
198
198
  - !ruby/object:Gem::Version
199
199
  version: 0.3.0
200
- - - ">="
200
+ - - "~>"
201
201
  - !ruby/object:Gem::Version
202
202
  version: 0.3.0
203
203
  type: :runtime
204
204
  prerelease: false
205
205
  version_requirements: !ruby/object:Gem::Requirement
206
206
  requirements:
207
- - - "~>"
207
+ - - ">="
208
208
  - !ruby/object:Gem::Version
209
209
  version: 0.3.0
210
- - - ">="
210
+ - - "~>"
211
211
  - !ruby/object:Gem::Version
212
212
  version: 0.3.0
213
213
  - !ruby/object:Gem::Dependency
214
214
  name: rubyzip
215
215
  requirement: !ruby/object:Gem::Requirement
216
216
  requirements:
217
- - - "~>"
217
+ - - ">="
218
218
  - !ruby/object:Gem::Version
219
219
  version: 2.0.0
220
- - - ">="
220
+ - - "~>"
221
221
  - !ruby/object:Gem::Version
222
222
  version: 2.0.0
223
223
  type: :runtime
224
224
  prerelease: false
225
225
  version_requirements: !ruby/object:Gem::Requirement
226
226
  requirements:
227
- - - "~>"
227
+ - - ">="
228
228
  - !ruby/object:Gem::Version
229
229
  version: 2.0.0
230
- - - ">="
230
+ - - "~>"
231
231
  - !ruby/object:Gem::Version
232
232
  version: 2.0.0
233
233
  description: A collection of iOS development tools used by Future Workshops
@@ -290,14 +290,15 @@ files:
290
290
  - spec/support/ctx_rake.rb
291
291
  - spec/support/double_helper.rb
292
292
  - spec/support/project_generator.rb
293
- - templates/bitrise/bitrise.yml.tt
294
- - templates/default_project/bitrise/bitrise.yml.tt
293
+ - templates/.DS_Store
294
+ - templates/bitrise/android/bitrise.yml.tt
295
+ - templates/bitrise/ios/bitrise.yml.tt
296
+ - templates/default_project/bitrise/android/bitrise.yml.tt
297
+ - templates/default_project/bitrise/ios/bitrise.yml.tt
295
298
  - templates/default_project/gemset/Gemfile
296
299
  - templates/default_project/git/.github/PULL_REQUEST_TEMPLATE.md
297
300
  - templates/default_project/git/.gitignore
298
301
  - templates/objc_project/xcode/%project_name%.xcworkspace/contents.xcworkspacedata.tt
299
- - templates/objc_project/xcode/%project_name%.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
300
- - templates/objc_project/xcode/%project_name%/%project_name%.entitlements
301
302
  - templates/objc_project/xcode/%project_name%/%project_name%.xcodeproj/project.pbxproj.tt
302
303
  - templates/objc_project/xcode/%project_name%/%project_name%.xcodeproj/project.xcworkspace/contents.xcworkspacedata.tt
303
304
  - templates/objc_project/xcode/%project_name%/%project_name%.xcodeproj/xcshareddata/xcschemes/%project_name%.xcscheme.tt
@@ -339,7 +340,6 @@ files:
339
340
  - templates/objc_project/xcode/Rakefile.tt
340
341
  - templates/swift_project/xcode/%project_name%.xcworkspace/contents.xcworkspacedata.tt
341
342
  - templates/swift_project/xcode/%project_name%.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
342
- - templates/swift_project/xcode/%project_name%/%project_name%.entitlements
343
343
  - templates/swift_project/xcode/%project_name%/%project_name%.xcodeproj/project.pbxproj.tt
344
344
  - templates/swift_project/xcode/%project_name%/%project_name%.xcodeproj/project.xcworkspace/contents.xcworkspacedata.tt
345
345
  - templates/swift_project/xcode/%project_name%/%project_name%.xcodeproj/xcshareddata/xcschemes/%project_name%.xcscheme.tt
@@ -395,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
395
395
  - !ruby/object:Gem::Version
396
396
  version: '0'
397
397
  requirements: []
398
- rubygems_version: 3.1.2
398
+ rubygems_version: 3.0.9
399
399
  signing_key:
400
400
  specification_version: 4
401
401
  summary: Future Workshops project tools
@@ -1,8 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3
- <plist version="1.0">
4
- <dict>
5
- <key>com.apple.developer.default-data-protection</key>
6
- <string>NSFileProtectionComplete</string>
7
- </dict>
8
- </plist>
@@ -1,8 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3
- <plist version="1.0">
4
- <dict>
5
- <key>IDEDidComputeMac32BitWarning</key>
6
- <true/>
7
- </dict>
8
- </plist>
@@ -1,8 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3
- <plist version="1.0">
4
- <dict>
5
- <key>com.apple.developer.default-data-protection</key>
6
- <string>NSFileProtectionComplete</string>
7
- </dict>
8
- </plist>