fwtoolkit 2.4.0 → 2.6.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/features/xcode/create.feature +1 -1
  3. data/lib/fwtoolkit/version.rb +1 -1
  4. data/templates/.DS_Store +0 -0
  5. data/templates/bitrise/android/bitrise.yml.tt +13 -6
  6. data/templates/bitrise/ios/bitrise.yml.tt +16 -24
  7. data/templates/default_project/bitrise/android/bitrise.yml.tt +13 -6
  8. data/templates/default_project/bitrise/ios/bitrise.yml.tt +16 -24
  9. metadata +7 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b34e55fe508458da4b6083e4bfef84b774fdd0ccf5f49f9f52db3fa0a7901efa
4
- data.tar.gz: 446f45b663fbf34383fbd5f16d45c492cc57a9d606b4488d941394227c5f9e5b
3
+ metadata.gz: a55c00b823549ea7c62362e352c7e86c93cf3257321e5864d90bac1d0e332576
4
+ data.tar.gz: e923a7d60127626ea73b88776531b50f2f806b3f5b8af97be94b46d34df8204b
5
5
  SHA512:
6
- metadata.gz: b1ba5fa746bf3e1c8c1abf85d593882e4959b7c55e14aaf6432305a4129167e49ad4923da299f91fd3e61e19f7c522af9f9ff990253fee6f5382ce70390fac9f
7
- data.tar.gz: ab359414f786c9b03a797bcf94223f60b4ed9a9e0e3f1206dfb60d5ae9cfeda9dc2220377a5cdd8d6e6eb52667833da1bae9bbade39b5780a6cf3c1fc545b13a
6
+ metadata.gz: c286a2b22e2c9fe352621119c460bb1326317abf02613baccd7440882320cc58a74778bf71fa494babe412f13b442cad98c855add17ee1695cef704c010e3504
7
+ data.tar.gz: 37d956a6658b834fdcd4f5acc1a022e799775945fd4d4e74d58cbf50650a7da70214e8ddd8df3aa54368da561aab23fcac49d1bb5b1a11bd8da64a2e732bd5a3
data/features/xcode/create.feature CHANGED
@@ -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 |
data/lib/fwtoolkit/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module FWToolkit
2
- VERSION = "2.4.0"
2
+ VERSION = "2.6.2"
3
3
  end
data/templates/.DS_Store ADDED
Binary file
data/templates/bitrise/android/bitrise.yml.tt CHANGED
@@ -73,7 +73,7 @@ workflows:
73
73
  - _deploy_google
74
74
  _build:
75
75
  steps:
76
- - git::https://github.com/FutureWorkshops/bitrise-step-s3-download.git@master:
76
+ - s3-download@1:
77
77
  title: Download keystore
78
78
  inputs:
79
79
  - aws_access_key: "$AWS_ACCESS_KEY_ID"
@@ -85,26 +85,33 @@ workflows:
85
85
  inputs:
86
86
  - gradle_file: "$GRADLE_BUILD_FILE_PATH"
87
87
  - gradle_task: "-Pproject.buildnumber=$BITRISE_BUILD_NUMBER -Pproject.buildversion=$BUILD_VERSION
88
- -Pproject.bundleId=$PACKAGE_NAME assemble$BUILD_FLAVOUR$BUILD_TASK"
88
+ -Pproject.bundleId=$PACKAGE_NAME bundle$BUILD_FLAVOUR$BUILD_TASK"
89
89
  - app_file_include_filter: |
90
90
  *-universal-*.apk
91
91
  *.aab
92
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"
93
99
  envs:
94
100
  - KEYSTORE_PATH: "$KEYSTORE_OUTPUT_PATH/$KEYSTORE_NAME"
95
101
  _deploy_bitrise:
96
102
  steps:
97
- - deploy-to-bitrise-io@1.12: {}
103
+ - deploy-to-bitrise-io@1.12:
104
+ inputs:
105
+ - generate_universal_apk_if_none: 'false'
98
106
  _deploy_google:
99
107
  steps:
100
- - google-play-deploy@3.1:
108
+ - google-play-deploy@3.3:
101
109
  inputs:
102
110
  - service_account_json_key_path: "$BITRISEIO_GOOGLE_PLAY_JSON_AUTH_PATH_URL"
103
111
  - package_name: "$PACKAGE_NAME"
104
112
  - mapping_file: ''
105
113
  - track: internal
106
- - app_path: "$BITRISE_APK_PATH"
107
- - apk_path: "$BITRISE_SIGNED_APK_PATH"
114
+ - app_path: "$BITRISE_AAB_PATH"
108
115
  _preflight:
109
116
  steps:
110
117
  - build-number-adjust@1.0.0:
data/templates/bitrise/ios/bitrise.yml.tt CHANGED
@@ -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
@@ -227,8 +216,8 @@ workflows:
227
216
  - xcode_project_path: "$FW_PROJECT_DIR/$FW_XCODEPROJ_NAME"
228
217
  - target: "$BITRISE_SCHEME"
229
218
  - configuration: Release
230
- - xcode_setting_keys: PROVISIONING_PROFILE_SPECIFIER | DEVELOPMENT_TEAM
231
- - new_values: "$PROVISIONING_PROFILE_NAME | $DEVPORTAL_TEAM"
219
+ - xcode_setting_keys: PROVISIONING_PROFILE_SPECIFIER | DEVELOPMENT_TEAM | CODE_SIGN_IDENTITY
220
+ - new_values: "$PROVISIONING_PROFILE_NAME | $DEVPORTAL_TEAM | $CODESIGN_IDENTITY"
232
221
  - cocoapods-install: {}
233
222
  - script:
234
223
  title: Set environment
@@ -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'
data/templates/default_project/bitrise/android/bitrise.yml.tt CHANGED
@@ -73,7 +73,7 @@ workflows:
73
73
  - _deploy_google
74
74
  _build:
75
75
  steps:
76
- - git::https://github.com/FutureWorkshops/bitrise-step-s3-download.git@master:
76
+ - s3-download@1:
77
77
  title: Download keystore
78
78
  inputs:
79
79
  - aws_access_key: "$AWS_ACCESS_KEY_ID"
@@ -85,26 +85,33 @@ workflows:
85
85
  inputs:
86
86
  - gradle_file: "$GRADLE_BUILD_FILE_PATH"
87
87
  - gradle_task: "-Pproject.buildnumber=$BITRISE_BUILD_NUMBER -Pproject.buildversion=$BUILD_VERSION
88
- -Pproject.bundleId=$PACKAGE_NAME assemble$BUILD_FLAVOUR$BUILD_TASK"
88
+ -Pproject.bundleId=$PACKAGE_NAME bundle$BUILD_FLAVOUR$BUILD_TASK"
89
89
  - app_file_include_filter: |
90
90
  *-universal-*.apk
91
91
  *.aab
92
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"
93
99
  envs:
94
100
  - KEYSTORE_PATH: "$KEYSTORE_OUTPUT_PATH/$KEYSTORE_NAME"
95
101
  _deploy_bitrise:
96
102
  steps:
97
- - deploy-to-bitrise-io@1.12: {}
103
+ - deploy-to-bitrise-io@1.12:
104
+ inputs:
105
+ - generate_universal_apk_if_none: 'false'
98
106
  _deploy_google:
99
107
  steps:
100
- - google-play-deploy@3.1:
108
+ - google-play-deploy@3.3:
101
109
  inputs:
102
110
  - service_account_json_key_path: "$BITRISEIO_GOOGLE_PLAY_JSON_AUTH_PATH_URL"
103
111
  - package_name: "$PACKAGE_NAME"
104
112
  - mapping_file: ''
105
113
  - track: internal
106
- - app_path: "$BITRISE_APK_PATH"
107
- - apk_path: "$BITRISE_SIGNED_APK_PATH"
114
+ - app_path: "$BITRISE_AAB_PATH"
108
115
  _preflight:
109
116
  steps:
110
117
  - build-number-adjust@1.0.0:
data/templates/default_project/bitrise/ios/bitrise.yml.tt CHANGED
@@ -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
@@ -227,8 +216,8 @@ workflows:
227
216
  - xcode_project_path: "$FW_PROJECT_DIR/$FW_XCODEPROJ_NAME"
228
217
  - target: "$BITRISE_SCHEME"
229
218
  - configuration: Release
230
- - xcode_setting_keys: PROVISIONING_PROFILE_SPECIFIER | DEVELOPMENT_TEAM
231
- - new_values: "$PROVISIONING_PROFILE_NAME | $DEVPORTAL_TEAM"
219
+ - xcode_setting_keys: PROVISIONING_PROFILE_SPECIFIER | DEVELOPMENT_TEAM | CODE_SIGN_IDENTITY
220
+ - new_values: "$PROVISIONING_PROFILE_NAME | $DEVPORTAL_TEAM | $CODESIGN_IDENTITY"
232
221
  - cocoapods-install: {}
233
222
  - script:
234
223
  title: Set environment
@@ -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,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fwtoolkit
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.4.0
4
+ version: 2.6.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Future Workshops
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-01-26 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
@@ -136,20 +136,20 @@ dependencies:
136
136
  requirements:
137
137
  - - ">="
138
138
  - !ruby/object:Gem::Version
139
- version: 2.1.4
139
+ version: 2.2.0
140
140
  - - "~>"
141
141
  - !ruby/object:Gem::Version
142
- version: 2.1.4
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
147
  - - ">="
148
148
  - !ruby/object:Gem::Version
149
- version: 2.1.4
149
+ version: 2.2.0
150
150
  - - "~>"
151
151
  - !ruby/object:Gem::Version
152
- version: 2.1.4
152
+ version: 2.2.8
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: multi_json
155
155
  requirement: !ruby/object:Gem::Requirement
@@ -290,6 +290,7 @@ files:
290
290
  - spec/support/ctx_rake.rb
291
291
  - spec/support/double_helper.rb
292
292
  - spec/support/project_generator.rb
293
+ - templates/.DS_Store
293
294
  - templates/bitrise/android/bitrise.yml.tt
294
295
  - templates/bitrise/ios/bitrise.yml.tt
295
296
  - templates/default_project/bitrise/android/bitrise.yml.tt