Skip to content

Commit

Permalink
Remove deprecated filter inputs (#108)
Browse files Browse the repository at this point in the history
* Remove deprecated filter inputs

* *
  • Loading branch information
ofalvai authored Nov 26, 2024
1 parent e655023 commit 674d478
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 60 deletions.
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,6 @@ You can also set up file path filters to avoid exporting unwanted archives or ma
| `mapping_file_exclude_filter` | The Step will **not** copy the generated mapping files that match this filter into the Bitrise deploy directory. You can use this input to avoid moving a beta mapping file, for example. If you specify an empty filter, every mapping file (selected by `mapping_file_include_filter`) will be copied. Example: Do not copy any mapping.txt file that is in a `beta` directoy: ``` */beta/mapping.txt ``` | | `*/tmp/*` |
| `cache_level` | `all` - will cache build-cache and dependencies `only_deps` - will cache dependencies only `none` - won't cache any of the above | required | `only_deps` |
| `gradle_options` | Flags added to the end of the Gradle call. You can use multiple options, separated by a space. Example: `--stacktrace --debug` If `--debug` or `-d` options are set then only the last 20 lines of the raw gradle output will be visible in the build log. The full raw output will be exported to the `$BITRISE_GRADLE_RAW_RESULT_TEXT_PATH` variable and will be added as a build artifact. | | `--stacktrace` |
| `apk_file_include_filter` | This input is **DEPRECATED** - use the `APK and AAB file include filter` input instead and set this input to empty value. The step will copy the generated APK files that match this filter into the Bitrise Deploy Directory. If you specify an empty filter, the new input "APK and AAB file include filter" will be used. Example: Copy every APK file: ``` "*.apk" ``` Copy every APK file with a filename that contains `release`, like (`./app/build/outputs/apk/app-release-unsigned.apk`): ``` *release*.apk ``` | | |
| `apk_file_exclude_filter` | This input is **DEPRECATED** - use the `APK and AAB file exclude filter` input instead and set this input to empty value. One filter per line. The step will **not** copy the generated APK files that match this filters into the Bitrise Deploy Directory. You can use this filter to avoid moving unalinged and/or unsigned apk files. If you specify an empty filter, the new input "APK and AAB file exclude filter" will be used. Examples: Do not copy APK files with a filename that contains `unaligned`: ``` *unaligned*.apk ``` Do not copy APK files with a filename that contains `unaligned` and/or `Test`: ``` *unaligned*.apk *Test*.apk ``` | | |
| `collect_metrics` | Enable Gradle metrics collection and send data to Bitrise. | | `no` |
</details>

Expand Down
22 changes: 0 additions & 22 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ type Config struct {

// Metrics
CollectMetrics bool `env:"collect_metrics,opt[yes,no]"`

// Deprecated
ApkFileIncludeFilter string `env:"apk_file_include_filter"`
ApkFileExcludeFilter string `env:"apk_file_exclude_filter"`
}

func runGradleTask(gradleTool, buildFile, tasks, options string, destDir string) error {
Expand Down Expand Up @@ -166,24 +162,6 @@ func validateAndMigrateConfig(config *Config) error {
}
}

if strings.TrimSpace(config.ApkFileIncludeFilter) != "" {
log.Warnf(`Step input 'APK file include filter' (apk_file_include_filter) is deprecated and will be removed soon,
use 'APK and AAB file include filter' (app_file_include_filter) instead.`)
fmt.Println()
log.Infof(`'APK file include filter' (apk_file_include_filter) is used, 'APK and AAB file include filter' (app_file_include_filter) is ignored.
Use 'APK and AAB file include filter' and set 'APK file include filter' to empty value.`)
fmt.Println()
config.AppFileIncludeFilter = config.ApkFileIncludeFilter
}
if strings.TrimSpace(config.ApkFileExcludeFilter) != "" {
log.Warnf(`Step input 'APK file exclude filter' (apk_file_exclude_filter) is deprecated and will be removed soon,
use 'APK and AAB file exclude filter' (app_file_exclude_filter) instead.`)
fmt.Println()
log.Infof(`'APK file exclude filter' (apk_file_exclude_filter) is used, 'APK and AAB file exclude filter' (app_file_exclude_filter) is ignored.
Use 'APK and AAB file exclude filter' and set 'APK file exclude filter' to empty value.`)
fmt.Println()
config.AppFileExcludeFilter = config.ApkFileExcludeFilter
}
return nil
}

Expand Down
36 changes: 0 additions & 36 deletions step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -210,42 +210,6 @@ inputs:
You can use multiple options, separated by a space. Example: `--stacktrace --debug`
If `--debug` or `-d` options are set then only the last 20 lines of the raw gradle output will be visible in the build log.
The full raw output will be exported to the `$BITRISE_GRADLE_RAW_RESULT_TEXT_PATH` variable and will be added as a build artifact.
- apk_file_include_filter: null
opts:
category: Deprecated
title: APK file include filter
description: |
This input is **DEPRECATED** - use the `APK and AAB file include filter` input instead and set this input to empty value.
The step will copy the generated APK files that match this filter into the Bitrise Deploy Directory.
If you specify an empty filter, the new input "APK and AAB file include filter" will be used.
Example:
Copy every APK file:
```
"*.apk"
```
Copy every APK file with a filename that contains `release`, like (`./app/build/outputs/apk/app-release-unsigned.apk`):
```
*release*.apk
```
- apk_file_exclude_filter: null
opts:
category: Deprecated
title: APK file exclude filter
description: |
This input is **DEPRECATED** - use the `APK and AAB file exclude filter` input instead and set this input to empty value.
One filter per line. The step will **not** copy the generated APK files that match this filters into the Bitrise Deploy Directory.
You can use this filter to avoid moving unalinged and/or unsigned apk files.
If you specify an empty filter, the new input "APK and AAB file exclude filter" will be used.
Examples:
Do not copy APK files with a filename that contains `unaligned`:
```
*unaligned*.apk
```
Do not copy APK files with a filename that contains `unaligned` and/or `Test`:
```
*unaligned*.apk
*Test*.apk
```
- collect_metrics: "no"
opts:
title: Collect Gradle metrics
Expand Down

0 comments on commit 674d478

Please sign in to comment.