From 9336b546773d2375db8daad91d332f3b3dec2c6a Mon Sep 17 00:00:00 2001 From: Piotr Adamczyk Date: Wed, 10 Feb 2021 15:37:51 +0100 Subject: [PATCH 1/2] refactor: Reorganize domain layer of flank scripts --- docs/flank-scripts/README.md | 119 ++++--- docs/flank-scripts/ops_structure.md | 2 +- flank-scripts/README.md | 324 +----------------- flank-scripts/build.gradle.kts | 2 +- .../scripts/cli/assemble/FlankCommand.kt | 2 +- .../flank/scripts/cli/assemble/GoCommand.kt | 2 +- .../cli/assemble/android/AppCommand.kt | 4 +- .../cli/assemble/ios/EarlGreyCommand.kt | 2 +- .../cli/assemble/ios/ExampleCommand.kt | 2 +- .../cli/assemble/ios/FlankExampleCommand.kt | 2 +- .../scripts/cli/assemble/ios/FtlCommand.kt | 2 +- .../assemble/ios/GameLoopExampleCommand.kt | 2 +- .../cli/assemble/ios/RunFtlLocalCommand.kt | 2 +- .../cli/assemble/ios/TestPlansExample.kt | 2 +- .../dependencies/InstallXcPrettyCommand.kt | 2 +- .../cli/dependencies/SetupIosEnvCommand.kt | 2 +- .../dependencies/UniversalFrameworkCommand.kt | 2 +- .../cli/dependencies/UpdateBinariesCommand.kt | 2 +- .../cli/firebase/CheckForSdkUpdatesCommand.kt | 2 +- .../cli/firebase/GenerateClientCommand.kt | 2 +- .../scripts/cli/firebase/UpdateApiCommand.kt | 2 +- .../cli/github/CopyIssuePropertiesCommand.kt | 2 +- .../scripts/cli/github/DeleteOldTagCommand.kt | 2 +- .../cli/github/DeleteReleaseCommand.kt | 2 +- .../scripts/cli/github/MakeReleaseCommand.kt | 2 +- .../integrationtests/ProcessResultCommand.kt | 4 +- .../cli/linter/ApplyToGitHooksCommand.kt | 2 +- .../scripts/cli/linter/ApplyToIdeCommand.kt | 2 +- .../release/GenerateReleaseNotesCommand.kt | 2 +- .../scripts/cli/release/NextTagCommand.kt | 2 +- .../ops/{shell => assemble}/BuildFlank.kt | 2 +- .../go/BuildGO.kt => assemble/BuildGo.kt} | 4 +- .../{utils => ops/assemble}/GradleCommand.kt | 0 .../android/BuildBaseAndroidApk.kt | 2 +- .../android/BuildBaseAndroidTests.kt | 2 +- .../android/BuildCucumberSampleApk.kt | 2 +- .../android/BuildDuplicatedNamesApks.kt | 2 +- .../android/BuildMultiModulesApks.kt | 2 +- .../android/Common.kt | 2 +- .../android/RunAndroidOps.kt | 2 +- .../ios/BuildEarlGreyExample.kt | 2 +- .../ios/BuildExample.kt | 6 +- .../ios/BuildFlankExampleCommand.kt | 2 +- .../buildexample => assemble}/ios/BuildFtl.kt | 4 +- .../ios/BuildGameLoopExampleCommand.kt | 2 +- .../ios/BuildIosIPA.kt | 8 +- .../ios/BuildIosTestArtifacts.kt | 8 +- .../ios/BuildTestPlansExample.kt | 2 +- .../ios/IosBuildCommand.kt | 2 +- .../ios/LipoHelper.kt | 2 +- .../ios/RunFtlLocal.kt | 2 +- .../ios/UniversalFramework.kt | 2 +- .../dependencies}/DownloadSoftware.kt | 5 +- .../InstallXcPretty.kt | 3 +- .../{shell => dependencies}/SetupIosEnv.kt | 4 +- .../updatebinaries/UpdateAtomic.kt | 2 +- .../updatebinaries/UpdateBinaries.kt | 2 +- .../updatebinaries/UpdateLlvm.kt | 2 +- .../updatebinaries/UpdateSwift.kt | 2 +- .../CheckForSDKUpdateCommand.kt | 2 +- .../firebase/sdk => firebase}/CommitList.kt | 2 +- .../firebase/sdk => firebase}/Extensions.kt | 2 +- .../GenerateJavaClient.kt | 6 +- .../sdk => firebase}/LastSDKUpdateRun.kt | 2 +- .../sdk => firebase}/OpenedUpdates.kt | 2 +- .../sdk => firebase}/SDKUpdateContext.kt | 2 +- .../apiclient => firebase}/UpdateApiJson.kt | 4 +- .../CopyGitHubProperties.kt | 2 +- .../hub => github}/DeleteOldRelease.kt | 2 +- .../{release/hub => github}/DeleteOldTag.kt | 2 +- .../FindReferenceIssue.kt | 2 +- .../{release/hub => github}/ReleaseFlank.kt | 2 +- .../{pullrequest => github}/SetAssignees.kt | 2 +- .../ops/{pullrequest => github}/SetLabels.kt | 2 +- .../CommitList.kt | 2 +- .../Extensions.kt | 2 +- .../IntegrationContext.kt | 2 +- .../IssueList.kt | 2 +- .../PrepareMessage.kt | 2 +- .../ProcessIntegrationTestsResult.kt | 2 +- .../WorkflowSummary.kt | 2 +- .../ApplyKtlintToIdea.kt | 2 +- .../{contribution => linter}/LinkGitHooks.kt | 2 +- .../ops/{ci => release}/AppendReleaseNotes.kt | 2 +- .../ops/{ci => release}/CreateReleaseNotes.kt | 2 +- .../ops/{ci => release}/NextReleaseTag.kt | 2 +- .../cli/release/MakeReleaseCommandTest.kt | 2 +- .../ConventionalCommitFormatterTest.kt | 3 +- .../ReleaseNotesWithTypeTest.kt | 3 +- .../sdk => firebase}/SDKUpdateTest.kt | 2 +- .../FindReferenceIssueTest.kt | 2 +- .../SetAssigneesTest.kt | 2 +- .../{pullrequest => github}/SetLabelsTest.kt | 2 +- .../ProcessResultTest.kt | 2 +- .../AppendReleaseNotesTest.kt | 3 +- .../NextReleaseTagGeneratorTest.kt | 2 +- 96 files changed, 176 insertions(+), 492 deletions(-) mode change 100644 => 120000 flank-scripts/README.md rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell => assemble}/BuildFlank.kt (95%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample/go/BuildGO.kt => assemble/BuildGo.kt} (94%) rename flank-scripts/src/main/kotlin/flank/scripts/{utils => ops/assemble}/GradleCommand.kt (100%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/android/BuildBaseAndroidApk.kt (95%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/android/BuildBaseAndroidTests.kt (94%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/android/BuildCucumberSampleApk.kt (95%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/android/BuildDuplicatedNamesApks.kt (95%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/android/BuildMultiModulesApks.kt (94%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/android/Common.kt (91%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/android/RunAndroidOps.kt (79%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/ios/BuildEarlGreyExample.kt (94%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/ios/BuildExample.kt (92%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/ios/BuildFlankExampleCommand.kt (92%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/ios/BuildFtl.kt (92%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/ios/BuildGameLoopExampleCommand.kt (93%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/ios/BuildIosIPA.kt (88%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/ios/BuildIosTestArtifacts.kt (94%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/ios/BuildTestPlansExample.kt (93%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/ios/IosBuildCommand.kt (96%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/ios/LipoHelper.kt (73%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/ios/RunFtlLocal.kt (91%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/buildexample => assemble}/ios/UniversalFramework.kt (97%) rename flank-scripts/src/main/kotlin/flank/scripts/{utils => ops/dependencies}/DownloadSoftware.kt (83%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell => dependencies}/InstallXcPretty.kt (58%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell => dependencies}/SetupIosEnv.kt (70%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell => dependencies}/updatebinaries/UpdateAtomic.kt (96%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell => dependencies}/updatebinaries/UpdateBinaries.kt (85%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell => dependencies}/updatebinaries/UpdateLlvm.kt (97%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell => dependencies}/updatebinaries/UpdateSwift.kt (98%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/firebase/sdk => firebase}/CheckForSDKUpdateCommand.kt (98%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/firebase/sdk => firebase}/CommitList.kt (95%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/firebase/sdk => firebase}/Extensions.kt (98%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/firebase/apiclient => firebase}/GenerateJavaClient.kt (87%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/firebase/sdk => firebase}/LastSDKUpdateRun.kt (86%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/firebase/sdk => firebase}/OpenedUpdates.kt (93%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/firebase/sdk => firebase}/SDKUpdateContext.kt (87%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{shell/firebase/apiclient => firebase}/UpdateApiJson.kt (90%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{pullrequest => github}/CopyGitHubProperties.kt (97%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{release/hub => github}/DeleteOldRelease.kt (82%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{release/hub => github}/DeleteOldTag.kt (95%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{pullrequest => github}/FindReferenceIssue.kt (93%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{release/hub => github}/ReleaseFlank.kt (98%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{pullrequest => github}/SetAssignees.kt (94%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{pullrequest => github}/SetLabels.kt (94%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{integration => integrationtests}/CommitList.kt (95%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{integration => integrationtests}/Extensions.kt (98%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{integration => integrationtests}/IntegrationContext.kt (85%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{integration => integrationtests}/IssueList.kt (93%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{integration => integrationtests}/PrepareMessage.kt (97%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{integration => integrationtests}/ProcessIntegrationTestsResult.kt (96%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{integration => integrationtests}/WorkflowSummary.kt (86%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{contribution => linter}/ApplyKtlintToIdea.kt (95%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{contribution => linter}/LinkGitHooks.kt (83%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{ci => release}/AppendReleaseNotes.kt (95%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{ci => release}/CreateReleaseNotes.kt (95%) rename flank-scripts/src/main/kotlin/flank/scripts/ops/{ci => release}/NextReleaseTag.kt (97%) rename flank-scripts/src/test/kotlin/flank/scripts/ops/{ci/releasenotes => common}/ConventionalCommitFormatterTest.kt (94%) rename flank-scripts/src/test/kotlin/flank/scripts/ops/{ci/releasenotes => common}/ReleaseNotesWithTypeTest.kt (97%) rename flank-scripts/src/test/kotlin/flank/scripts/ops/{shell/firebase/sdk => firebase}/SDKUpdateTest.kt (98%) rename flank-scripts/src/test/kotlin/flank/scripts/ops/{pullrequest => github}/FindReferenceIssueTest.kt (97%) rename flank-scripts/src/test/kotlin/flank/scripts/ops/{pullrequest => github}/SetAssigneesTest.kt (96%) rename flank-scripts/src/test/kotlin/flank/scripts/ops/{pullrequest => github}/SetLabelsTest.kt (96%) rename flank-scripts/src/test/kotlin/flank/scripts/ops/{integration => integrationtests}/ProcessResultTest.kt (98%) rename flank-scripts/src/test/kotlin/flank/scripts/ops/{ci/releasenotes => release}/AppendReleaseNotesTest.kt (96%) rename flank-scripts/src/test/kotlin/flank/scripts/ops/{ci => release}/NextReleaseTagGeneratorTest.kt (98%) diff --git a/docs/flank-scripts/README.md b/docs/flank-scripts/README.md index 4dfd8ba767..2de8b10c41 100644 --- a/docs/flank-scripts/README.md +++ b/docs/flank-scripts/README.md @@ -202,30 +202,77 @@ Properties are skipped by git and should not be attached to a commit. Note, the │ └── objects │ └── ConvertToEpicRequest.kt ├── ops +│ ├── assemble +│ │ ├── BuildFlank.kt +│ │ ├── BuildGo.kt +│ │ ├── GradleCommand.kt +│ │ ├── android +│ │ │ ├── BuildBaseAndroidApk.kt +│ │ │ ├── BuildBaseAndroidTests.kt +│ │ │ ├── BuildCucumberSampleApk.kt +│ │ │ ├── BuildDuplicatedNamesApks.kt +│ │ │ ├── BuildMultiModulesApks.kt +│ │ │ ├── Common.kt +│ │ │ └── RunAndroidOps.kt +│ │ └── ios +│ │ ├── BuildEarlGreyExample.kt +│ │ ├── BuildExample.kt +│ │ ├── BuildFlankExampleCommand.kt +│ │ ├── BuildFtl.kt +│ │ ├── BuildGameLoopExampleCommand.kt +│ │ ├── BuildIosIPA.kt +│ │ ├── BuildIosTestArtifacts.kt +│ │ ├── BuildTestPlansExample.kt +│ │ ├── IosBuildCommand.kt +│ │ ├── LipoHelper.kt +│ │ ├── RunFtlLocal.kt +│ │ └── UniversalFramework.kt │ ├── ci -│ │ ├── CreateReleaseNotes.kt -│ │ ├── NextReleaseTag.kt -│ │ └── releasenotes -│ │ ├── AppendReleaseNotes.kt -│ │ ├── ConventionalCommitFormatter.kt -│ │ ├── GenerateChangeLog.kt -│ │ └── ReleaseNotesWithType.kt +│ ├── common +│ │ ├── ConventionalCommitFormatter.kt +│ │ ├── EarlGreyExampleConsts.kt +│ │ ├── GenerateChangeLog.kt +│ │ └── ReleaseNotesWithType.kt │ ├── contribution -│ │ ├── ApplyKtlintToIdea.kt -│ │ └── LinkGitHooks.kt │ ├── dependencies │ │ ├── DependenciesResultCheck.kt │ │ ├── DependencyExtensions.kt │ │ ├── DependencyUpdate.kt +│ │ ├── DownloadSoftware.kt │ │ ├── FindOutdatedDependencies.kt │ │ ├── FindVersionInLines.kt │ │ ├── GradleDependency.kt +│ │ ├── InstallXcPretty.kt +│ │ ├── SetupIosEnv.kt │ │ ├── UpdateAllDependencies.kt │ │ ├── UpdateDependencies.kt │ │ ├── UpdateGradle.kt │ │ ├── UpdatePlugins.kt -│ │ └── UpdateVersionsInFile.kt +│ │ ├── UpdateVersionsInFile.kt +│ │ └── updatebinaries +│ │ ├── UpdateAtomic.kt +│ │ ├── UpdateBinaries.kt +│ │ ├── UpdateLlvm.kt +│ │ └── UpdateSwift.kt +│ ├── firebase +│ │ ├── CheckForSDKUpdateCommand.kt +│ │ ├── CommitList.kt +│ │ ├── Extensions.kt +│ │ ├── GenerateJavaClient.kt +│ │ ├── LastSDKUpdateRun.kt +│ │ ├── OpenedUpdates.kt +│ │ ├── SDKUpdateContext.kt +│ │ └── UpdateApiJson.kt +│ ├── github +│ │ ├── CopyGitHubProperties.kt +│ │ ├── DeleteOldRelease.kt +│ │ ├── DeleteOldTag.kt +│ │ ├── FindReferenceIssue.kt +│ │ ├── ReleaseFlank.kt +│ │ ├── SetAssignees.kt +│ │ └── SetLabels.kt │ ├── integration +│ ├── integrationtests │ │ ├── CommitList.kt │ │ ├── Extensions.kt │ │ ├── IntegrationContext.kt @@ -233,65 +280,28 @@ Properties are skipped by git and should not be attached to a commit. Note, the │ │ ├── PrepareMessage.kt │ │ ├── ProcessIntegrationTestsResult.kt │ │ └── WorkflowSummary.kt +│ ├── linter +│ │ ├── ApplyKtlintToIdea.kt +│ │ └── LinkGitHooks.kt │ ├── pullrequest -│ │ ├── CopyGitHubProperties.kt -│ │ ├── FindReferenceIssue.kt -│ │ ├── SetAssignees.kt -│ │ └── SetLabels.kt │ ├── release +│ │ ├── AppendReleaseNotes.kt +│ │ ├── CreateReleaseNotes.kt +│ │ ├── NextReleaseTag.kt │ │ ├── hub -│ │ │ ├── DeleteOldRelease.kt -│ │ │ ├── DeleteOldTag.kt -│ │ │ └── ReleaseFlank.kt │ │ └── jfrog │ │ ├── DeleteOldSnapshot.kt │ │ ├── JFrogCommandHelper.kt │ │ └── SyncMaven.kt │ ├── shell -│ │ ├── BuildFlank.kt -│ │ ├── InstallXcPretty.kt -│ │ ├── SetupIosEnv.kt │ │ ├── buildexample │ │ │ ├── android -│ │ │ │ ├── BuildBaseAndroidApk.kt -│ │ │ │ ├── BuildBaseAndroidTests.kt -│ │ │ │ ├── BuildCucumberSampleApk.kt -│ │ │ │ ├── BuildDuplicatedNamesApks.kt -│ │ │ │ ├── BuildMultiModulesApks.kt -│ │ │ │ ├── Common.kt -│ │ │ │ └── RunAndroidOps.kt │ │ │ ├── go -│ │ │ │ └── BuildGO.kt │ │ │ └── ios -│ │ │ ├── BuildEarlGreyExample.kt -│ │ │ ├── BuildExample.kt -│ │ │ ├── BuildFlankExampleCommand.kt -│ │ │ ├── BuildFtl.kt -│ │ │ ├── BuildGameLoopExampleCommand.kt -│ │ │ ├── BuildIosIPA.kt -│ │ │ ├── BuildIosTestArtifacts.kt -│ │ │ ├── BuildTestPlansExample.kt -│ │ │ ├── EarlGreyExampleConsts.kt -│ │ │ ├── IosBuildCommand.kt -│ │ │ ├── LipoHelper.kt -│ │ │ ├── RunFtlLocal.kt -│ │ │ └── UniversalFramework.kt │ │ ├── firebase │ │ │ ├── apiclient -│ │ │ │ ├── GenerateJavaClient.kt -│ │ │ │ └── UpdateApiJson.kt │ │ │ └── sdk -│ │ │ ├── CheckForSDKUpdateCommand.kt -│ │ │ ├── CommitList.kt -│ │ │ ├── Extensions.kt -│ │ │ ├── LastSDKUpdateRun.kt -│ │ │ ├── OpenedUpdates.kt -│ │ │ └── SDKUpdateContext.kt │ │ └── updatebinaries -│ │ ├── UpdateAtomic.kt -│ │ ├── UpdateBinaries.kt -│ │ ├── UpdateLlvm.kt -│ │ └── UpdateSwift.kt │ └── testartifacts │ ├── ArtifactsArchive.kt │ ├── Constants.kt @@ -306,11 +316,9 @@ Properties are skipped by git and should not be attached to a commit. Note, the │ ├── UploadFixtures.kt │ └── ZipArtifacts.kt └── utils - ├── DownloadSoftware.kt ├── Env.kt ├── FastFailForWindows.kt ├── Git.kt - ├── GradleCommand.kt ├── MarkdownFormatter.kt ├── Path.kt ├── Serialization.kt @@ -320,4 +328,5 @@ Properties are skipped by git and should not be attached to a commit. Note, the ├── FlankScriptsExceptionMappers.kt └── FlankScriptsExceptions.kt + ``` diff --git a/docs/flank-scripts/ops_structure.md b/docs/flank-scripts/ops_structure.md index dc91e8f59d..29cbe6b905 100644 --- a/docs/flank-scripts/ops_structure.md +++ b/docs/flank-scripts/ops_structure.md @@ -5,7 +5,7 @@ called `common`. For better code organization `updatebinaries` has a separate package inside `dependencies`, as well as `jfrog` in `release` package. -Ops package structure and file organization is presented on tree below: +Ops package structure and file organization are presented on the tree below: ```bash ├── ops diff --git a/flank-scripts/README.md b/flank-scripts/README.md deleted file mode 100644 index 127a9d4206..0000000000 --- a/flank-scripts/README.md +++ /dev/null @@ -1,323 +0,0 @@ -# flank-scripts -This repository contains helper scripts for developing flank. For now, it contains just release related scripts. - -## Build and usage - -### Build - -To build flank-scripts: - - Run script `buildFlankScripts.sh` in `flank-scripts/bash/` directory - - Run command `./gradlew clean flank-scripts:assemble flank-scripts:shadowJar` and manual copy file from `/flank-scripts/build/libs/flank-scripts.jar` to `flank-scripts/bash/` - - You could always run/build it from Intellij IDEA - -### Usage - -Run the script with arguments -`flankScripts [] []` - -If you need help with available commands or arguments you could always use option `--help` - -## Available commands and options - -### Command List - -- `assemble` - Group of commands to assemble application - - `android` - Subgroup of commands for Android test application assembly - - `app` - Assemble Android test application - - `ios` - Subgroup of commands for iOS test applications assembly - - `earl_grey` - Assemble iOS earl grey application - - `example` - Assemble iOS example application - - `flank_example` - Assemble iOS flank example application - - `ftl` - Assemble iOS ftl example application - - `game_loop` - Assemble iOS game loop application - - `test_plans` - Assemble iOS test plans application - - `all` - Assemble all iOS applications - - `flank` - Build Flank - - `go_artifacts` - Generate go artifacts - -___ - -- `dependencies` - Group of commands related to dependencies tasks - - `install_xcpretty` - Install xcpretty formatter - - `setup_ios_env` - Setup iOS environment - - `universal_framework_files` - Create Universal Framework files - - `update_binaries` - Update binaries used by Flank - - `update` - Update repository 3rd party dependencies - -___ - -- `firebase` - Group of commands for managing firebase integrations - - `check_for_sdk_updates` - Check for new SDK features and create update tasks for it - - `generate_client` - Generate Java Client based on api schema - - `update_api` - Update api schema - -___ - -- `github` - Group of command for managing Github integration - - `copy_issue_properties` - Copy properties(assignees, story points, labels) from issue to pull request - - `delete_old_tag` - Delete old tag on GitHub - - `delete_release` - Delete old release on github - - `make_release` - Make new Github release - -___ - -- `integration_tests` - Group of commands for handling integration tests (1) - - `process_results` - Process results of integration tests - -___ - -- `linter` - Group of commands used for applying correct coding style - - `apply_to_git_hooks` - Apply Linter pre-commit hook - - `apply_to_ide` - Apply Linter to IDE - -___ - -- `release` - Group of commands for creating Flank release - - `delete_snapshot` - Delete snapshot package from artifacts repository - - `generate_release_notes` - Generate release notes - - `next_tag` - Get tag for next release - - `sync_with_maven_central` - Sync artifact's repository with Maven central - -___ - -- `test_artifacts` - Group of commands for artifacts management - - `download` - Download test artifacts zip asset to test_artifacts directory. - - `link` - Create symbolic link to under test_runner/src/test/kotlin/ftl/fixtures/tmp to - test_artifacts/{branchName}. - - `prepare`- Creates a fresh copy of test artifacts for the current working branch, basing on an existing one. - - `remove_remote` - Remove remote copy of test artifacts. - - `resolve` - Automatically prepare local artifacts if needed. - - `unzip` - Unpack test artifacts zip archive. - - `upload` - Upload test artifacts zip as github release asset. - - `zip` - Create zip archive from test artifacts directory. - -(1) - please note that there is only one command, but it may change in the future. - - -### Arguments - -To show applicable arguments for command use `--help` or `-h` options: -`flankScripts [] --help` -or -`flankScripts [] -h` - -## Testing -To test your script with different settings use `flank-debug.properties` file. Uncomment and replace with desired values. -Properties are skipped by git and should not be attached to a commit. Note, `test` task ignores your own properties and will use the default. - -#### List of possible configs -| Key | Description | Default value | -|:----------------|:---------------------|:---:| -|`zenhub.repo-id`|Flank's repo ID in zenhub app. Used to create new epics.|`84221974`| -|`repo.flank`|Flank test runner repo. Essential property for github client.|`Flank/flank`| -|`repo.gcloud_cli`|Flank's fork of gcloud sdk repo.|`Flank/gcloud_cli`| -|`repo.test-artifacts`|Flank's source of artifacts (apks, binaries, etc) used for testing|`Flank/test_artifacts`| -|`integration.workflow-filename`|GH Action integration tests workflow file. Used to fetch list of commits since it's last run.|`full_suite_integration_tests.yml`| -|`integration.issue-poster`|Name of account that creates IT issue|`github-actions[bot]`| -|`sdk-check.workflow-filename`|GH Action dependencies update workflow file. Used to fetch list of commits since it's last run.|`update_dependencies_and_client.yml`| -|`sdk-check.issue-poster`|Name of account that creates dependencies issues/epics|`github-actions[bot]`| - -## Directory structure - -```bash -. -├── cli -│ ├── Main.kt -│ ├── assemble -│ │ ├── AssembleCommand.kt -│ │ ├── FlankCommand.kt -│ │ ├── GoCommand.kt -│ │ ├── android -│ │ │ ├── AndroidCommand.kt -│ │ │ └── AppCommand.kt -│ │ └── ios -│ │ ├── EarlGreyCommand.kt -│ │ ├── ExampleCommand.kt -│ │ ├── FlankExampleCommand.kt -│ │ ├── FtlCommand.kt -│ │ ├── GameLoopExampleCommand.kt -│ │ ├── IosCommand.kt -│ │ ├── RunFtlLocalCommand.kt -│ │ └── TestPlansExample.kt -│ ├── dependencies -│ │ ├── DependenciesCommand.kt -│ │ ├── InstallXcPrettyCommand.kt -│ │ ├── SetupIosEnvCommand.kt -│ │ ├── UniversalFrameworkCommand.kt -│ │ ├── UpdateBinariesCommand.kt -│ │ └── UpdateCommand.kt -│ ├── firebase -│ │ ├── CheckForSdkUpdatesCommand.kt -│ │ ├── FirebaseCommand.kt -│ │ ├── GenerateClientCommand.kt -│ │ └── UpdateApiCommand.kt -│ ├── github -│ │ ├── CopyIssuePropertiesCommand.kt -│ │ ├── DeleteOldTagCommand.kt -│ │ ├── DeleteReleaseCommand.kt -│ │ ├── GitHubCommand.kt -│ │ └── MakeReleaseCommand.kt -│ ├── integrationtests -│ │ ├── IntegrationTestsCommand.kt -│ │ └── ProcessResultCommand.kt -│ ├── linter -│ │ ├── ApplyToGitHooksCommand.kt -│ │ ├── ApplyToIdeCommand.kt -│ │ └── LinterCommand.kt -│ ├── release -│ │ ├── DeleteSnapshotCommand.kt -│ │ ├── GenerateReleaseNotesCommand.kt -│ │ ├── NextTagCommand.kt -│ │ ├── ReleaseCommand.kt -│ │ └── SyncWithMavenCentralCommand.kt -│ └── testartifacts -│ ├── DownloadCommand.kt -│ ├── LinkCommand.kt -│ ├── PrepareCommand.kt -│ ├── RemoveRemoteCommand.kt -│ ├── ResolveCommand.kt -│ ├── TestArtifactsCommand.kt -│ ├── UnzipCommand.kt -│ ├── UploadCommand.kt -│ └── ZipCommand.kt -├── data -│ ├── github -│ │ ├── GitHubErrorResponse.kt -│ │ ├── GithubApi.kt -│ │ ├── commons -│ │ │ └── LastWorkflowRunDate.kt -│ │ └── objects -│ │ ├── GitHubCommit.kt -│ │ ├── GitHubCreateIssue.kt -│ │ ├── GitHubCreateIssueComment.kt -│ │ ├── GitHubRelease.kt -│ │ ├── GitHubSetAssigneesRequest.kt -│ │ ├── GitHubSetLabelsRequest.kt -│ │ ├── GitHubUpdateIssue.kt -│ │ ├── GitHubWorkflowRun.kt -│ │ └── GithubPullRequest.kt -│ └── zenhub -│ ├── ZenHubAPI.kt -│ ├── ZenHubIssue.kt -│ └── objects -│ └── ConvertToEpicRequest.kt -├── ops -│ ├── ci -│ │ ├── CreateReleaseNotes.kt -│ │ ├── NextReleaseTag.kt -│ │ └── releasenotes -│ │ ├── AppendReleaseNotes.kt -│ │ ├── ConventionalCommitFormatter.kt -│ │ ├── GenerateChangeLog.kt -│ │ └── ReleaseNotesWithType.kt -│ ├── contribution -│ │ ├── ApplyKtlintToIdea.kt -│ │ └── LinkGitHooks.kt -│ ├── dependencies -│ │ ├── DependenciesResultCheck.kt -│ │ ├── DependencyExtensions.kt -│ │ ├── DependencyUpdate.kt -│ │ ├── FindOutdatedDependencies.kt -│ │ ├── FindVersionInLines.kt -│ │ ├── GradleDependency.kt -│ │ ├── UpdateAllDependencies.kt -│ │ ├── UpdateDependencies.kt -│ │ ├── UpdateGradle.kt -│ │ ├── UpdatePlugins.kt -│ │ └── UpdateVersionsInFile.kt -│ ├── integration -│ │ ├── CommitList.kt -│ │ ├── Extensions.kt -│ │ ├── IntegrationContext.kt -│ │ ├── IssueList.kt -│ │ ├── PrepareMessage.kt -│ │ ├── ProcessIntegrationTestsResult.kt -│ │ └── WorkflowSummary.kt -│ ├── pullrequest -│ │ ├── CopyGitHubProperties.kt -│ │ ├── FindReferenceIssue.kt -│ │ ├── SetAssignees.kt -│ │ └── SetLabels.kt -│ ├── release -│ │ ├── hub -│ │ │ ├── DeleteOldRelease.kt -│ │ │ ├── DeleteOldTag.kt -│ │ │ └── ReleaseFlank.kt -│ │ └── jfrog -│ │ ├── DeleteOldSnapshot.kt -│ │ ├── JFrogCommandHelper.kt -│ │ └── SyncMaven.kt -│ ├── shell -│ │ ├── BuildFlank.kt -│ │ ├── InstallXcPretty.kt -│ │ ├── SetupIosEnv.kt -│ │ ├── buildexample -│ │ │ ├── android -│ │ │ │ ├── BuildBaseAndroidApk.kt -│ │ │ │ ├── BuildBaseAndroidTests.kt -│ │ │ │ ├── BuildCucumberSampleApk.kt -│ │ │ │ ├── BuildDuplicatedNamesApks.kt -│ │ │ │ ├── BuildMultiModulesApks.kt -│ │ │ │ ├── Common.kt -│ │ │ │ └── RunAndroidOps.kt -│ │ │ ├── go -│ │ │ │ └── BuildGO.kt -│ │ │ └── ios -│ │ │ ├── BuildEarlGreyExample.kt -│ │ │ ├── BuildExample.kt -│ │ │ ├── BuildFlankExampleCommand.kt -│ │ │ ├── BuildFtl.kt -│ │ │ ├── BuildGameLoopExampleCommand.kt -│ │ │ ├── BuildIosIPA.kt -│ │ │ ├── BuildIosTestArtifacts.kt -│ │ │ ├── BuildTestPlansExample.kt -│ │ │ ├── EarlGreyExampleConsts.kt -│ │ │ ├── IosBuildCommand.kt -│ │ │ ├── LipoHelper.kt -│ │ │ ├── RunFtlLocal.kt -│ │ │ └── UniversalFramework.kt -│ │ ├── firebase -│ │ │ ├── apiclient -│ │ │ │ ├── GenerateJavaClient.kt -│ │ │ │ └── UpdateApiJson.kt -│ │ │ └── sdk -│ │ │ ├── CheckForSDKUpdateCommand.kt -│ │ │ ├── CommitList.kt -│ │ │ ├── Extensions.kt -│ │ │ ├── LastSDKUpdateRun.kt -│ │ │ ├── OpenedUpdates.kt -│ │ │ └── SDKUpdateContext.kt -│ │ └── updatebinaries -│ │ ├── UpdateAtomic.kt -│ │ ├── UpdateBinaries.kt -│ │ ├── UpdateLlvm.kt -│ │ └── UpdateSwift.kt -│ └── testartifacts -│ ├── ArtifactsArchive.kt -│ ├── Constants.kt -│ ├── Context.kt -│ ├── DownloadFixtures.kt -│ ├── IsNewVersionAvailable.kt -│ ├── LinkArtifacts.kt -│ ├── PrepareTestArtifacts.kt -│ ├── RemoveRemoteCopy.kt -│ ├── ResolveArtifacts.kt -│ ├── TestArtifactsRepo.kt -│ ├── UploadFixtures.kt -│ └── ZipArtifacts.kt -└── utils - ├── DownloadSoftware.kt - ├── Env.kt - ├── FastFailForWindows.kt - ├── Git.kt - ├── GradleCommand.kt - ├── MarkdownFormatter.kt - ├── Path.kt - ├── Serialization.kt - ├── ShellExecute.kt - ├── Version.kt - └── exceptions - ├── FlankScriptsExceptionMappers.kt - └── FlankScriptsExceptions.kt - -``` diff --git a/flank-scripts/README.md b/flank-scripts/README.md new file mode 120000 index 0000000000..d10aedbde3 --- /dev/null +++ b/flank-scripts/README.md @@ -0,0 +1 @@ +../docs/flank-scripts/README.md \ No newline at end of file diff --git a/flank-scripts/build.gradle.kts b/flank-scripts/build.gradle.kts index 15d744ab0f..9c5eb58bdd 100644 --- a/flank-scripts/build.gradle.kts +++ b/flank-scripts/build.gradle.kts @@ -28,7 +28,7 @@ shadowJar.apply { } } // .. -version = "1.6.0" +version = "1.6.1" group = "com.github.flank" application { diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/FlankCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/FlankCommand.kt index 528ac18eba..7d13aec4a3 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/FlankCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/FlankCommand.kt @@ -1,7 +1,7 @@ package flank.scripts.cli.assemble import com.github.ajalt.clikt.core.CliktCommand -import flank.scripts.ops.shell.buildFlank +import flank.scripts.ops.assemble.buildFlank object FlankCommand : CliktCommand( name = "flank", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/GoCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/GoCommand.kt index febc7e28d5..e9c8677193 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/GoCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/GoCommand.kt @@ -1,7 +1,7 @@ package flank.scripts.cli.assemble import com.github.ajalt.clikt.core.CliktCommand -import flank.scripts.ops.shell.buildexample.go.generateGoArtifacts +import flank.scripts.ops.assemble.generateGoArtifacts object GoCommand : CliktCommand( name = "go", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/android/AppCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/android/AppCommand.kt index 4e3964e123..45984dbaed 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/android/AppCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/android/AppCommand.kt @@ -4,8 +4,8 @@ import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.parameters.options.flag import com.github.ajalt.clikt.parameters.options.multiple import com.github.ajalt.clikt.parameters.options.option -import flank.scripts.ops.shell.buildexample.android.AndroidBuildConfiguration -import flank.scripts.ops.shell.buildexample.android.runAndroidBuild +import flank.scripts.ops.assemble.android.AndroidBuildConfiguration +import flank.scripts.ops.assemble.android.runAndroidBuild object AppCommand : CliktCommand( name = "app", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/EarlGreyCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/EarlGreyCommand.kt index 87d01ebd41..d4ca0098f1 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/EarlGreyCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/EarlGreyCommand.kt @@ -3,7 +3,7 @@ package flank.scripts.cli.assemble.ios import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.parameters.options.flag import com.github.ajalt.clikt.parameters.options.option -import flank.scripts.ops.shell.buildexample.ios.buildEarlGreyExample +import flank.scripts.ops.assemble.ios.buildEarlGreyExample object EarlGreyCommand : CliktCommand( name = "earl_grey", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/ExampleCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/ExampleCommand.kt index ce34c068be..e179b100ad 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/ExampleCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/ExampleCommand.kt @@ -1,7 +1,7 @@ package flank.scripts.cli.assemble.ios import com.github.ajalt.clikt.core.CliktCommand -import flank.scripts.ops.shell.buildexample.ios.buildIosExample +import flank.scripts.ops.assemble.ios.buildIosExample object ExampleCommand : CliktCommand( name = "example", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/FlankExampleCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/FlankExampleCommand.kt index 8f93302858..74ff8210fa 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/FlankExampleCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/FlankExampleCommand.kt @@ -3,7 +3,7 @@ package flank.scripts.cli.assemble.ios import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.parameters.options.flag import com.github.ajalt.clikt.parameters.options.option -import flank.scripts.ops.shell.buildexample.ios.buildIosFlankExample +import flank.scripts.ops.assemble.ios.buildIosFlankExample object FlankExampleCommand : CliktCommand( name = "flank_example", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/FtlCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/FtlCommand.kt index 470eea16c2..c340903036 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/FtlCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/FtlCommand.kt @@ -1,7 +1,7 @@ package flank.scripts.cli.assemble.ios import com.github.ajalt.clikt.core.CliktCommand -import flank.scripts.ops.shell.buildexample.ios.buildFtl +import flank.scripts.ops.assemble.ios.buildFtl object FtlCommand : CliktCommand( name = "ftl", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/GameLoopExampleCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/GameLoopExampleCommand.kt index 684308afda..e46d5c12e5 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/GameLoopExampleCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/GameLoopExampleCommand.kt @@ -3,7 +3,7 @@ package flank.scripts.cli.assemble.ios import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.parameters.options.flag import com.github.ajalt.clikt.parameters.options.option -import flank.scripts.ops.shell.buildexample.ios.buildIosGameLoopExampleCommand +import flank.scripts.ops.assemble.ios.buildIosGameLoopExampleCommand object GameLoopExampleCommand : CliktCommand( name = "game_loop", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/RunFtlLocalCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/RunFtlLocalCommand.kt index 5c5ff43ced..cbbc00afc9 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/RunFtlLocalCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/RunFtlLocalCommand.kt @@ -3,7 +3,7 @@ package flank.scripts.cli.assemble.ios import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.options.required -import flank.scripts.ops.shell.buildexample.ios.runFtlLocal +import flank.scripts.ops.assemble.ios.runFtlLocal object RunFtlLocalCommand : CliktCommand( name = "run_ftl_local", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/TestPlansExample.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/TestPlansExample.kt index 23131ea69a..277270867e 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/TestPlansExample.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/assemble/ios/TestPlansExample.kt @@ -3,7 +3,7 @@ package flank.scripts.cli.assemble.ios import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.parameters.options.flag import com.github.ajalt.clikt.parameters.options.option -import flank.scripts.ops.shell.buildexample.ios.buildTestPlansExample +import flank.scripts.ops.assemble.ios.buildTestPlansExample object TestPlansExample : CliktCommand( name = "test_plans", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/dependencies/InstallXcPrettyCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/dependencies/InstallXcPrettyCommand.kt index 79f5e39b7e..cde39deea7 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/dependencies/InstallXcPrettyCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/dependencies/InstallXcPrettyCommand.kt @@ -1,7 +1,7 @@ package flank.scripts.cli.dependencies import com.github.ajalt.clikt.core.CliktCommand -import flank.scripts.ops.shell.installXcPretty +import flank.scripts.ops.dependencies.installXcPretty object InstallXcPrettyCommand : CliktCommand( name = "install_xcpretty", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/dependencies/SetupIosEnvCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/dependencies/SetupIosEnvCommand.kt index 90c7882361..1d0442d33f 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/dependencies/SetupIosEnvCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/dependencies/SetupIosEnvCommand.kt @@ -1,7 +1,7 @@ package flank.scripts.cli.dependencies import com.github.ajalt.clikt.core.CliktCommand -import flank.scripts.ops.shell.setupIosEnv +import flank.scripts.ops.dependencies.setupIosEnv object SetupIosEnvCommand : CliktCommand( name = "setup_ios_env", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/dependencies/UniversalFrameworkCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/dependencies/UniversalFrameworkCommand.kt index 6c891f6fc2..699b4f0511 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/dependencies/UniversalFrameworkCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/dependencies/UniversalFrameworkCommand.kt @@ -1,7 +1,7 @@ package flank.scripts.cli.dependencies import com.github.ajalt.clikt.core.CliktCommand -import flank.scripts.ops.shell.buildexample.ios.createUniversalFrameworkFiles +import flank.scripts.ops.assemble.ios.createUniversalFrameworkFiles object UniversalFrameworkCommand : CliktCommand( name = "universal_framework_files", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/dependencies/UpdateBinariesCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/dependencies/UpdateBinariesCommand.kt index cb998868ae..a9b8258ae0 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/dependencies/UpdateBinariesCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/dependencies/UpdateBinariesCommand.kt @@ -1,7 +1,7 @@ package flank.scripts.cli.dependencies import com.github.ajalt.clikt.core.CliktCommand -import flank.scripts.ops.shell.updatebinaries.updateBinaries +import flank.scripts.ops.dependencies.updatebinaries.updateBinaries object UpdateBinariesCommand : CliktCommand( name = "update_binaries", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/firebase/CheckForSdkUpdatesCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/firebase/CheckForSdkUpdatesCommand.kt index 40ebd47b16..59097546f9 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/firebase/CheckForSdkUpdatesCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/firebase/CheckForSdkUpdatesCommand.kt @@ -3,7 +3,7 @@ package flank.scripts.cli.firebase import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.options.required -import flank.scripts.ops.shell.firebase.sdk.checkForSDKUpdate +import flank.scripts.ops.firebase.checkForSDKUpdate object CheckForSdkUpdatesCommand : CliktCommand( name = "check_for_sdk_updates", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/firebase/GenerateClientCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/firebase/GenerateClientCommand.kt index e88c772840..40d7aee1ac 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/firebase/GenerateClientCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/firebase/GenerateClientCommand.kt @@ -1,7 +1,7 @@ package flank.scripts.cli.firebase import com.github.ajalt.clikt.core.CliktCommand -import flank.scripts.ops.shell.firebase.apiclient.generateJavaClient +import flank.scripts.ops.firebase.generateJavaClient object GenerateClientCommand : CliktCommand( name = "generate_client", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/firebase/UpdateApiCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/firebase/UpdateApiCommand.kt index 2403cf67ec..050f3ba157 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/firebase/UpdateApiCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/firebase/UpdateApiCommand.kt @@ -1,7 +1,7 @@ package flank.scripts.cli.firebase import com.github.ajalt.clikt.core.CliktCommand -import flank.scripts.ops.shell.firebase.apiclient.updateApiJson +import flank.scripts.ops.firebase.updateApiJson object UpdateApiCommand : CliktCommand( name = "update_api", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/github/CopyIssuePropertiesCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/github/CopyIssuePropertiesCommand.kt index cc7c06b805..4fb9d97c3f 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/github/CopyIssuePropertiesCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/github/CopyIssuePropertiesCommand.kt @@ -4,7 +4,7 @@ import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.options.required import com.github.ajalt.clikt.parameters.types.int -import flank.scripts.ops.pullrequest.copyGitHubProperties +import flank.scripts.ops.github.copyGitHubProperties object CopyIssuePropertiesCommand : CliktCommand( name = "copy_issue_properties", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/github/DeleteOldTagCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/github/DeleteOldTagCommand.kt index be0be7265c..386173edd3 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/github/DeleteOldTagCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/github/DeleteOldTagCommand.kt @@ -3,7 +3,7 @@ package flank.scripts.cli.github import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.options.required -import flank.scripts.ops.release.hub.tryDeleteOldTag +import flank.scripts.ops.github.tryDeleteOldTag object DeleteOldTagCommand : CliktCommand( name = "delete_old_tag", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/github/DeleteReleaseCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/github/DeleteReleaseCommand.kt index 36ccfc9830..41772aec2a 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/github/DeleteReleaseCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/github/DeleteReleaseCommand.kt @@ -3,7 +3,7 @@ package flank.scripts.cli.github import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.options.required -import flank.scripts.ops.release.hub.deleteOldRelease +import flank.scripts.ops.github.deleteOldRelease object DeleteReleaseCommand : CliktCommand( name = "delete_release", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/github/MakeReleaseCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/github/MakeReleaseCommand.kt index e4aaee633a..54d2d520c7 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/github/MakeReleaseCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/github/MakeReleaseCommand.kt @@ -6,7 +6,7 @@ import com.github.ajalt.clikt.parameters.options.flag import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.options.required import com.github.ajalt.clikt.parameters.types.path -import flank.scripts.ops.release.hub.tryReleaseFlank +import flank.scripts.ops.github.tryReleaseFlank import kotlin.system.exitProcess object MakeReleaseCommand : CliktCommand( diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/integrationtests/ProcessResultCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/integrationtests/ProcessResultCommand.kt index ff7e01cbb1..c9b059bfc7 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/integrationtests/ProcessResultCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/integrationtests/ProcessResultCommand.kt @@ -5,8 +5,8 @@ import com.github.ajalt.clikt.parameters.options.default import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.options.required import com.github.ajalt.clikt.parameters.types.enum -import flank.scripts.ops.integration.ITResults -import flank.scripts.ops.integration.processIntegrationTestsResult +import flank.scripts.ops.integrationtests.ITResults +import flank.scripts.ops.integrationtests.processIntegrationTestsResult object ProcessResultCommand : CliktCommand( name = "process_results", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/linter/ApplyToGitHooksCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/linter/ApplyToGitHooksCommand.kt index 11677c807d..20efce035b 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/linter/ApplyToGitHooksCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/linter/ApplyToGitHooksCommand.kt @@ -1,7 +1,7 @@ package flank.scripts.cli.linter import com.github.ajalt.clikt.core.CliktCommand -import flank.scripts.ops.contribution.linkGitHooks +import flank.scripts.ops.linter.linkGitHooks object ApplyToGitHooksCommand : CliktCommand( name = "apply_to_git_hooks", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/linter/ApplyToIdeCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/linter/ApplyToIdeCommand.kt index 3dbc4ec3a7..26a608c625 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/linter/ApplyToIdeCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/linter/ApplyToIdeCommand.kt @@ -1,7 +1,7 @@ package flank.scripts.cli.linter import com.github.ajalt.clikt.core.CliktCommand -import flank.scripts.ops.contribution.applyKtlintToIdea +import flank.scripts.ops.linter.applyKtlintToIdea import kotlinx.coroutines.runBlocking object ApplyToIdeCommand : CliktCommand( diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/release/GenerateReleaseNotesCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/release/GenerateReleaseNotesCommand.kt index a8c125208d..1effb1e353 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/release/GenerateReleaseNotesCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/release/GenerateReleaseNotesCommand.kt @@ -5,7 +5,7 @@ import com.github.ajalt.clikt.parameters.options.default import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.options.required import com.google.common.annotations.VisibleForTesting -import flank.scripts.ops.ci.createReleaseNotes +import flank.scripts.ops.release.createReleaseNotes object GenerateReleaseNotesCommand : CliktCommand( name = "generate_release_notes", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/release/NextTagCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/release/NextTagCommand.kt index 66f1af077c..203cce8466 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/cli/release/NextTagCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/cli/release/NextTagCommand.kt @@ -3,7 +3,7 @@ package flank.scripts.cli.release import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.options.required -import flank.scripts.ops.ci.createNextReleaseTag +import flank.scripts.ops.release.createNextReleaseTag object NextTagCommand : CliktCommand( name = "next_tag", diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/BuildFlank.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/BuildFlank.kt similarity index 95% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/BuildFlank.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/BuildFlank.kt index 4599bdfa34..1d8f7baa7d 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/BuildFlank.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/BuildFlank.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell +package flank.scripts.ops.assemble import flank.common.rootDirectoryPathString import flank.scripts.utils.createGradleCommand diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/go/BuildGO.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/BuildGo.kt similarity index 94% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/go/BuildGO.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/BuildGo.kt index e5348a9fbf..c8ee9fd5fb 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/go/BuildGO.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/BuildGo.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.buildexample.go +package flank.scripts.ops.assemble import flank.common.flankFixturesTmpPath import flank.common.testProjectsPath @@ -13,7 +13,7 @@ fun generateGoArtifacts() { GoOS.values().forEach { createExecutable(it, goHelloBinDirectoryPath) } } -enum class GoOS( +private enum class GoOS( val goName: String, val directory: String, val extension: String = "" diff --git a/flank-scripts/src/main/kotlin/flank/scripts/utils/GradleCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/GradleCommand.kt similarity index 100% rename from flank-scripts/src/main/kotlin/flank/scripts/utils/GradleCommand.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/GradleCommand.kt diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/BuildBaseAndroidApk.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/BuildBaseAndroidApk.kt similarity index 95% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/BuildBaseAndroidApk.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/BuildBaseAndroidApk.kt index 647bb7f81f..6947b413b8 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/BuildBaseAndroidApk.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/BuildBaseAndroidApk.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.buildexample.android +package flank.scripts.ops.assemble.android import flank.common.androidTestProjectsPath import flank.common.flankFixturesTmpPath diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/BuildBaseAndroidTests.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/BuildBaseAndroidTests.kt similarity index 94% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/BuildBaseAndroidTests.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/BuildBaseAndroidTests.kt index 3db1963c52..6232883469 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/BuildBaseAndroidTests.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/BuildBaseAndroidTests.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.buildexample.android +package flank.scripts.ops.assemble.android import flank.common.androidTestProjectsPath import flank.common.flankFixturesTmpPath diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/BuildCucumberSampleApk.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/BuildCucumberSampleApk.kt similarity index 95% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/BuildCucumberSampleApk.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/BuildCucumberSampleApk.kt index 2781855030..09afc214f5 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/BuildCucumberSampleApk.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/BuildCucumberSampleApk.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.buildexample.android +package flank.scripts.ops.assemble.android import flank.common.androidTestProjectsPath import flank.common.flankFixturesTmpPath diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/BuildDuplicatedNamesApks.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/BuildDuplicatedNamesApks.kt similarity index 95% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/BuildDuplicatedNamesApks.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/BuildDuplicatedNamesApks.kt index 09f5e81a5c..f5492436c1 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/BuildDuplicatedNamesApks.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/BuildDuplicatedNamesApks.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.buildexample.android +package flank.scripts.ops.assemble.android import flank.common.androidTestProjectsPath import flank.common.flankFixturesTmpPath diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/BuildMultiModulesApks.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/BuildMultiModulesApks.kt similarity index 94% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/BuildMultiModulesApks.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/BuildMultiModulesApks.kt index 293e9d93c5..4899e43d1e 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/BuildMultiModulesApks.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/BuildMultiModulesApks.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.buildexample.android +package flank.scripts.ops.assemble.android import flank.common.androidTestProjectsPath import flank.common.flankFixturesTmpPath diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/Common.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/Common.kt similarity index 91% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/Common.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/Common.kt index 6f85f77a34..8770974737 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/Common.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/Common.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.buildexample.android +package flank.scripts.ops.assemble.android import java.io.File import java.nio.file.Files diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/RunAndroidOps.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/RunAndroidOps.kt similarity index 79% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/RunAndroidOps.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/RunAndroidOps.kt index a07fd03d30..7303f2a073 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/android/RunAndroidOps.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/android/RunAndroidOps.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.buildexample.android +package flank.scripts.ops.assemble.android fun AndroidBuildConfiguration.runAndroidBuild() = takeIf { generate }?.let { buildBaseApk() diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildEarlGreyExample.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildEarlGreyExample.kt similarity index 94% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildEarlGreyExample.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildEarlGreyExample.kt index 1653bf7343..1d8a08df51 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildEarlGreyExample.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildEarlGreyExample.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.buildexample.ios +package flank.scripts.ops.assemble.ios import flank.common.iOSTestProjectsPath import flank.scripts.ops.common.EARL_GREY_EXAMPLE diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildExample.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildExample.kt similarity index 92% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildExample.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildExample.kt index a1a0cdd150..f11903ef75 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildExample.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildExample.kt @@ -1,11 +1,11 @@ -package flank.scripts.ops.shell.buildexample.ios +package flank.scripts.ops.assemble.ios import flank.common.archive import flank.common.currentPath import flank.common.iOSTestProjectsPath -import flank.scripts.utils.downloadXcPrettyIfNeeded +import flank.scripts.ops.dependencies.downloadXcPrettyIfNeeded +import flank.scripts.ops.dependencies.installPodsIfNeeded import flank.scripts.utils.failIfWindows -import flank.scripts.utils.installPodsIfNeeded import flank.scripts.utils.pipe import java.nio.file.Files import java.nio.file.Path diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildFlankExampleCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildFlankExampleCommand.kt similarity index 92% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildFlankExampleCommand.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildFlankExampleCommand.kt index f64f9e58c6..a76694908b 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildFlankExampleCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildFlankExampleCommand.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.buildexample.ios +package flank.scripts.ops.assemble.ios import flank.common.iOSTestProjectsPath import flank.scripts.utils.failIfWindows diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildFtl.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildFtl.kt similarity index 92% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildFtl.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildFtl.kt index 749677b94c..0d0f2947f0 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildFtl.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildFtl.kt @@ -1,7 +1,7 @@ -package flank.scripts.ops.shell.buildexample.ios +package flank.scripts.ops.assemble.ios import flank.common.archive -import flank.scripts.utils.downloadXcPrettyIfNeeded +import flank.scripts.ops.dependencies.downloadXcPrettyIfNeeded import flank.scripts.utils.failIfWindows import flank.scripts.utils.pipe import java.nio.file.Files diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildGameLoopExampleCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildGameLoopExampleCommand.kt similarity index 93% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildGameLoopExampleCommand.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildGameLoopExampleCommand.kt index 65d556f606..e86c00dafc 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildGameLoopExampleCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildGameLoopExampleCommand.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.buildexample.ios +package flank.scripts.ops.assemble.ios import flank.common.iOSTestProjectsPath import flank.scripts.utils.failIfWindows diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildIosIPA.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildIosIPA.kt similarity index 88% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildIosIPA.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildIosIPA.kt index 8365165dfa..86866c12c0 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildIosIPA.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildIosIPA.kt @@ -1,9 +1,9 @@ -package flank.scripts.ops.shell.buildexample.ios +package flank.scripts.ops.assemble.ios import flank.common.flankFixturesIosTmpPath -import flank.scripts.utils.downloadCocoaPodsIfNeeded -import flank.scripts.utils.downloadXcPrettyIfNeeded -import flank.scripts.utils.installPodsIfNeeded +import flank.scripts.ops.dependencies.downloadCocoaPodsIfNeeded +import flank.scripts.ops.dependencies.downloadXcPrettyIfNeeded +import flank.scripts.ops.dependencies.installPodsIfNeeded import flank.scripts.utils.pipe import java.nio.file.Path import java.nio.file.Paths diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildIosTestArtifacts.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildIosTestArtifacts.kt similarity index 94% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildIosTestArtifacts.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildIosTestArtifacts.kt index 2789f2de19..1d1b9e9adb 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildIosTestArtifacts.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildIosTestArtifacts.kt @@ -1,10 +1,10 @@ -package flank.scripts.ops.shell.buildexample.ios +package flank.scripts.ops.assemble.ios import flank.common.archive import flank.common.flankFixturesIosTmpPath -import flank.scripts.utils.downloadCocoaPodsIfNeeded -import flank.scripts.utils.downloadXcPrettyIfNeeded -import flank.scripts.utils.installPodsIfNeeded +import flank.scripts.ops.dependencies.downloadCocoaPodsIfNeeded +import flank.scripts.ops.dependencies.downloadXcPrettyIfNeeded +import flank.scripts.ops.dependencies.installPodsIfNeeded import flank.scripts.utils.pipe import java.io.File import java.nio.file.Path diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildTestPlansExample.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildTestPlansExample.kt similarity index 93% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildTestPlansExample.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildTestPlansExample.kt index af032dbf4f..cec3344743 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildTestPlansExample.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildTestPlansExample.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.buildexample.ios +package flank.scripts.ops.assemble.ios import flank.common.iOSTestProjectsPath import flank.scripts.utils.failIfWindows diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/IosBuildCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/IosBuildCommand.kt similarity index 96% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/IosBuildCommand.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/IosBuildCommand.kt index 6ef49fc645..6cd7c7eb7d 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/IosBuildCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/IosBuildCommand.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.buildexample.ios +package flank.scripts.ops.assemble.ios fun createXcodeBuildForTestingCommand( buildDir: String, diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/LipoHelper.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/LipoHelper.kt similarity index 73% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/LipoHelper.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/LipoHelper.kt index b17c47969b..c11ea8465a 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/LipoHelper.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/LipoHelper.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.buildexample.ios +package flank.scripts.ops.assemble.ios fun createLipoCommand( outputPath: String, diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/RunFtlLocal.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/RunFtlLocal.kt similarity index 91% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/RunFtlLocal.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/RunFtlLocal.kt index ef090a196e..31146cbe88 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/RunFtlLocal.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/RunFtlLocal.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.buildexample.ios +package flank.scripts.ops.assemble.ios import flank.common.currentPath import flank.scripts.utils.failIfWindows diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/UniversalFramework.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/UniversalFramework.kt similarity index 97% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/UniversalFramework.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/UniversalFramework.kt index 56975d083f..3a3471addb 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/UniversalFramework.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/UniversalFramework.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.buildexample.ios +package flank.scripts.ops.assemble.ios import flank.common.currentPath import flank.scripts.utils.failIfWindows diff --git a/flank-scripts/src/main/kotlin/flank/scripts/utils/DownloadSoftware.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/DownloadSoftware.kt similarity index 83% rename from flank-scripts/src/main/kotlin/flank/scripts/utils/DownloadSoftware.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/DownloadSoftware.kt index 4238f1d539..9453d13d55 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/utils/DownloadSoftware.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/DownloadSoftware.kt @@ -1,5 +1,8 @@ -package flank.scripts.utils +package flank.scripts.ops.dependencies +import flank.scripts.utils.checkAndInstallIfNeed +import flank.scripts.utils.commandInstalledOr +import flank.scripts.utils.runCommand import java.nio.file.Path fun downloadXcPrettyIfNeeded() { diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/InstallXcPretty.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/InstallXcPretty.kt similarity index 58% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/InstallXcPretty.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/InstallXcPretty.kt index 3b8551fe73..9497ac0737 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/InstallXcPretty.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/InstallXcPretty.kt @@ -1,6 +1,5 @@ -package flank.scripts.ops.shell +package flank.scripts.ops.dependencies -import flank.scripts.utils.downloadXcPrettyIfNeeded import flank.scripts.utils.failIfWindows fun installXcPretty() { diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/SetupIosEnv.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/SetupIosEnv.kt similarity index 70% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/SetupIosEnv.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/SetupIosEnv.kt index 4bb39117fd..79ad33046f 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/SetupIosEnv.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/SetupIosEnv.kt @@ -1,10 +1,8 @@ -package flank.scripts.ops.shell +package flank.scripts.ops.dependencies import flank.common.iOSTestProjectsPath import flank.scripts.ops.common.EARL_GREY_EXAMPLE -import flank.scripts.utils.downloadCocoaPodsIfNeeded import flank.scripts.utils.failIfWindows -import flank.scripts.utils.installPodsIfNeeded import java.nio.file.Paths fun setupIosEnv() { diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/updatebinaries/UpdateAtomic.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/updatebinaries/UpdateAtomic.kt similarity index 96% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/updatebinaries/UpdateAtomic.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/updatebinaries/UpdateAtomic.kt index 07a8d72128..e2363f7583 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/updatebinaries/UpdateAtomic.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/updatebinaries/UpdateAtomic.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.updatebinaries +package flank.scripts.ops.dependencies.updatebinaries import flank.common.downloadFile import flank.common.extract diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/updatebinaries/UpdateBinaries.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/updatebinaries/UpdateBinaries.kt similarity index 85% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/updatebinaries/UpdateBinaries.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/updatebinaries/UpdateBinaries.kt index 50ec6e1d0d..4f68c31644 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/updatebinaries/UpdateBinaries.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/updatebinaries/UpdateBinaries.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.updatebinaries +package flank.scripts.ops.dependencies.updatebinaries import kotlinx.coroutines.joinAll import kotlinx.coroutines.launch diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/updatebinaries/UpdateLlvm.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/updatebinaries/UpdateLlvm.kt similarity index 97% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/updatebinaries/UpdateLlvm.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/updatebinaries/UpdateLlvm.kt index e2dbbc0455..c0814723db 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/updatebinaries/UpdateLlvm.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/updatebinaries/UpdateLlvm.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.updatebinaries +package flank.scripts.ops.dependencies.updatebinaries import flank.common.downloadFile import flank.common.extract diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/updatebinaries/UpdateSwift.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/updatebinaries/UpdateSwift.kt similarity index 98% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/updatebinaries/UpdateSwift.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/updatebinaries/UpdateSwift.kt index 927c0d894b..a6b7f3ec0d 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/updatebinaries/UpdateSwift.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/updatebinaries/UpdateSwift.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.updatebinaries +package flank.scripts.ops.dependencies.updatebinaries import flank.common.downloadFile import flank.common.extract diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/sdk/CheckForSDKUpdateCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/CheckForSDKUpdateCommand.kt similarity index 98% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/sdk/CheckForSDKUpdateCommand.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/CheckForSDKUpdateCommand.kt index 629b5ed4db..845815952a 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/sdk/CheckForSDKUpdateCommand.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/CheckForSDKUpdateCommand.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.firebase.sdk +package flank.scripts.ops.firebase import com.github.kittinunf.fuel.Fuel import flank.common.config.flankGcloudCLIRepository diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/sdk/CommitList.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/CommitList.kt similarity index 95% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/sdk/CommitList.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/CommitList.kt index acc2611df4..d61a5337f4 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/sdk/CommitList.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/CommitList.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.firebase.sdk +package flank.scripts.ops.firebase import flank.common.config.flankGcloudCLIRepository import flank.scripts.data.github.getGitHubCommitList diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/sdk/Extensions.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/Extensions.kt similarity index 98% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/sdk/Extensions.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/Extensions.kt index e73c7769ee..664c6af834 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/sdk/Extensions.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/Extensions.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.firebase.sdk +package flank.scripts.ops.firebase import com.github.kittinunf.result.Result import com.github.kittinunf.result.onError diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/apiclient/GenerateJavaClient.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/GenerateJavaClient.kt similarity index 87% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/apiclient/GenerateJavaClient.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/GenerateJavaClient.kt index c8dba1da68..377b1865e1 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/apiclient/GenerateJavaClient.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/GenerateJavaClient.kt @@ -1,8 +1,8 @@ -package flank.scripts.ops.shell.firebase.apiclient +package flank.scripts.ops.firebase -import flank.scripts.utils.checkIfPipInstalled +import flank.scripts.ops.dependencies.checkIfPipInstalled +import flank.scripts.ops.dependencies.installClientGeneratorIfNeeded import flank.scripts.utils.exceptions.ShellCommandException -import flank.scripts.utils.installClientGeneratorIfNeeded import flank.scripts.utils.runCommand import java.nio.file.Files import java.nio.file.Paths diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/sdk/LastSDKUpdateRun.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/LastSDKUpdateRun.kt similarity index 86% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/sdk/LastSDKUpdateRun.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/LastSDKUpdateRun.kt index a9c560ca93..1eae52fed2 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/sdk/LastSDKUpdateRun.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/LastSDKUpdateRun.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.firebase.sdk +package flank.scripts.ops.firebase import flank.common.config.updateDependenciesWorkflowFilename import flank.scripts.data.github.commons.getLastWorkflowRunDate diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/sdk/OpenedUpdates.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/OpenedUpdates.kt similarity index 93% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/sdk/OpenedUpdates.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/OpenedUpdates.kt index fda07ea2cc..6a429ab6c9 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/sdk/OpenedUpdates.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/OpenedUpdates.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.firebase.sdk +package flank.scripts.ops.firebase import com.github.kittinunf.result.getOrElse import com.github.kittinunf.result.onError diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/sdk/SDKUpdateContext.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/SDKUpdateContext.kt similarity index 87% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/sdk/SDKUpdateContext.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/SDKUpdateContext.kt index 42e8793163..03b5e42aa1 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/sdk/SDKUpdateContext.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/SDKUpdateContext.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.firebase.sdk +package flank.scripts.ops.firebase import flank.scripts.data.github.objects.GithubPullRequest import flank.scripts.utils.Version diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/apiclient/UpdateApiJson.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/UpdateApiJson.kt similarity index 90% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/apiclient/UpdateApiJson.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/UpdateApiJson.kt index c9d89ca420..2888b97b5e 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/firebase/apiclient/UpdateApiJson.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/firebase/UpdateApiJson.kt @@ -1,9 +1,9 @@ -package flank.scripts.ops.shell.firebase.apiclient +package flank.scripts.ops.firebase import flank.common.config.flankGcloudCLIRepository import flank.common.currentPath import flank.common.downloadFile -import flank.scripts.utils.downloadSortJsonIfNeeded +import flank.scripts.ops.dependencies.downloadSortJsonIfNeeded import flank.scripts.utils.runCommand import java.nio.file.Paths diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/pullrequest/CopyGitHubProperties.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/github/CopyGitHubProperties.kt similarity index 97% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/pullrequest/CopyGitHubProperties.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/github/CopyGitHubProperties.kt index 981e48b0b1..59275c88f5 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/pullrequest/CopyGitHubProperties.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/github/CopyGitHubProperties.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.pullrequest +package flank.scripts.ops.github import com.github.kittinunf.result.onError import com.github.kittinunf.result.success diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/release/hub/DeleteOldRelease.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/github/DeleteOldRelease.kt similarity index 82% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/release/hub/DeleteOldRelease.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/github/DeleteOldRelease.kt index c6be4bc9dc..19b6c55836 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/release/hub/DeleteOldRelease.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/github/DeleteOldRelease.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.release.hub +package flank.scripts.ops.github import flank.scripts.utils.runCommand diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/release/hub/DeleteOldTag.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/github/DeleteOldTag.kt similarity index 95% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/release/hub/DeleteOldTag.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/github/DeleteOldTag.kt index bfb8990960..0a54b86285 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/release/hub/DeleteOldTag.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/github/DeleteOldTag.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.release.hub +package flank.scripts.ops.github import com.github.kittinunf.result.Result import flank.common.logLn diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/pullrequest/FindReferenceIssue.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/github/FindReferenceIssue.kt similarity index 93% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/pullrequest/FindReferenceIssue.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/github/FindReferenceIssue.kt index 93af4bf9a0..1a1796fd40 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/pullrequest/FindReferenceIssue.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/github/FindReferenceIssue.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.pullrequest +package flank.scripts.ops.github import flank.scripts.data.github.objects.GithubPullRequest diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/release/hub/ReleaseFlank.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/github/ReleaseFlank.kt similarity index 98% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/release/hub/ReleaseFlank.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/github/ReleaseFlank.kt index 8ab6102d41..0298cb8cf6 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/release/hub/ReleaseFlank.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/github/ReleaseFlank.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.release.hub +package flank.scripts.ops.github import com.google.common.annotations.VisibleForTesting import flank.scripts.ops.common.asString diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/pullrequest/SetAssignees.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/github/SetAssignees.kt similarity index 94% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/pullrequest/SetAssignees.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/github/SetAssignees.kt index e80d9e3282..8a8a340299 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/pullrequest/SetAssignees.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/github/SetAssignees.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.pullrequest +package flank.scripts.ops.github import com.github.kittinunf.result.getOrNull import com.github.kittinunf.result.map diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/pullrequest/SetLabels.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/github/SetLabels.kt similarity index 94% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/pullrequest/SetLabels.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/github/SetLabels.kt index 06fe622e10..f9d428a5b2 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/pullrequest/SetLabels.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/github/SetLabels.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.pullrequest +package flank.scripts.ops.github import com.github.kittinunf.result.getOrNull import com.github.kittinunf.result.map diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/integration/CommitList.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/CommitList.kt similarity index 95% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/integration/CommitList.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/CommitList.kt index 3609e7b0be..15b7ff856f 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/integration/CommitList.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/CommitList.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.integration +package flank.scripts.ops.integrationtests import com.github.kittinunf.result.getOrElse import com.github.kittinunf.result.onError diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/integration/Extensions.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/Extensions.kt similarity index 98% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/integration/Extensions.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/Extensions.kt index 2162cb69ff..5ab6c2a8d4 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/integration/Extensions.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/Extensions.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.integration +package flank.scripts.ops.integrationtests import com.github.kittinunf.result.onError import flank.scripts.data.github.objects.GitHubCreateIssueCommentRequest diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/integration/IntegrationContext.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/IntegrationContext.kt similarity index 85% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/integration/IntegrationContext.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/IntegrationContext.kt index 5f359f668f..488e06ecb4 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/integration/IntegrationContext.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/IntegrationContext.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.integration +package flank.scripts.ops.integrationtests data class IntegrationContext( val result: ITResults, diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/integration/IssueList.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/IssueList.kt similarity index 93% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/integration/IssueList.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/IssueList.kt index 5d13c8145e..6f1502a2c5 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/integration/IssueList.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/IssueList.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.integration +package flank.scripts.ops.integrationtests import com.github.kittinunf.result.getOrElse import com.github.kittinunf.result.onError diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/integration/PrepareMessage.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/PrepareMessage.kt similarity index 97% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/integration/PrepareMessage.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/PrepareMessage.kt index 97015c43d6..629e15e79e 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/integration/PrepareMessage.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/PrepareMessage.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.integration +package flank.scripts.ops.integrationtests import flank.common.config.flankRepository import flank.scripts.data.github.objects.GithubPullRequest diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/integration/ProcessIntegrationTestsResult.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/ProcessIntegrationTestsResult.kt similarity index 96% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/integration/ProcessIntegrationTestsResult.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/ProcessIntegrationTestsResult.kt index dad15f9fd7..f6dd7b1c26 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/integration/ProcessIntegrationTestsResult.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/ProcessIntegrationTestsResult.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.integration +package flank.scripts.ops.integrationtests import kotlinx.coroutines.runBlocking diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/integration/WorkflowSummary.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/WorkflowSummary.kt similarity index 86% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/integration/WorkflowSummary.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/WorkflowSummary.kt index a72dd0a739..82720f99a6 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/integration/WorkflowSummary.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/integrationtests/WorkflowSummary.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.integration +package flank.scripts.ops.integrationtests import flank.common.config.fullSuiteWorkflowFilename import flank.scripts.data.github.commons.getLastWorkflowRunDate diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/contribution/ApplyKtlintToIdea.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/linter/ApplyKtlintToIdea.kt similarity index 95% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/contribution/ApplyKtlintToIdea.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/linter/ApplyKtlintToIdea.kt index 4bb430c738..3479f42417 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/contribution/ApplyKtlintToIdea.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/linter/ApplyKtlintToIdea.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.contribution +package flank.scripts.ops.linter import flank.common.deleteFile import flank.common.downloadFile diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/contribution/LinkGitHooks.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/linter/LinkGitHooks.kt similarity index 83% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/contribution/LinkGitHooks.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/linter/LinkGitHooks.kt index 7f9dad1d2d..dd92d93416 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/contribution/LinkGitHooks.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/linter/LinkGitHooks.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.contribution +package flank.scripts.ops.linter import flank.common.logLn import flank.scripts.utils.runCommand diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/ci/AppendReleaseNotes.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/release/AppendReleaseNotes.kt similarity index 95% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/ci/AppendReleaseNotes.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/release/AppendReleaseNotes.kt index f9f69606d8..5eea5f0cc9 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/ci/AppendReleaseNotes.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/release/AppendReleaseNotes.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.ci +package flank.scripts.ops.release import flank.common.withNewLineAtTheEnd import flank.scripts.ops.common.ReleaseNotesWithType diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/ci/CreateReleaseNotes.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/release/CreateReleaseNotes.kt similarity index 95% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/ci/CreateReleaseNotes.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/release/CreateReleaseNotes.kt index bd306d4df5..f797ecf04f 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/ci/CreateReleaseNotes.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/release/CreateReleaseNotes.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.ci +package flank.scripts.ops.release import com.github.kittinunf.result.map import com.github.kittinunf.result.success diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/ci/NextReleaseTag.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/release/NextReleaseTag.kt similarity index 97% rename from flank-scripts/src/main/kotlin/flank/scripts/ops/ci/NextReleaseTag.kt rename to flank-scripts/src/main/kotlin/flank/scripts/ops/release/NextReleaseTag.kt index d35caf7de7..90a9111813 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/ops/ci/NextReleaseTag.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/ops/release/NextReleaseTag.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.ci +package flank.scripts.ops.release import com.github.kittinunf.result.Result import flank.scripts.data.github.getLatestReleaseTag diff --git a/flank-scripts/src/test/kotlin/flank/scripts/cli/release/MakeReleaseCommandTest.kt b/flank-scripts/src/test/kotlin/flank/scripts/cli/release/MakeReleaseCommandTest.kt index e134439527..9bc71aa88a 100644 --- a/flank-scripts/src/test/kotlin/flank/scripts/cli/release/MakeReleaseCommandTest.kt +++ b/flank-scripts/src/test/kotlin/flank/scripts/cli/release/MakeReleaseCommandTest.kt @@ -1,7 +1,7 @@ package flank.scripts.cli.release import flank.scripts.cli.github.MakeReleaseCommand -import flank.scripts.ops.release.hub.releaseFlank +import flank.scripts.ops.github.releaseFlank import io.mockk.every import io.mockk.mockkStatic import org.junit.Rule diff --git a/flank-scripts/src/test/kotlin/flank/scripts/ops/ci/releasenotes/ConventionalCommitFormatterTest.kt b/flank-scripts/src/test/kotlin/flank/scripts/ops/common/ConventionalCommitFormatterTest.kt similarity index 94% rename from flank-scripts/src/test/kotlin/flank/scripts/ops/ci/releasenotes/ConventionalCommitFormatterTest.kt rename to flank-scripts/src/test/kotlin/flank/scripts/ops/common/ConventionalCommitFormatterTest.kt index cde2771489..5a8f6f5277 100644 --- a/flank-scripts/src/test/kotlin/flank/scripts/ops/ci/releasenotes/ConventionalCommitFormatterTest.kt +++ b/flank-scripts/src/test/kotlin/flank/scripts/ops/common/ConventionalCommitFormatterTest.kt @@ -1,7 +1,6 @@ -package flank.scripts.ops.ci.releasenotes +package flank.scripts.ops.common import com.google.common.truth.Truth.assertThat -import flank.scripts.ops.common.mapPrTitleWithType import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.Parameterized diff --git a/flank-scripts/src/test/kotlin/flank/scripts/ops/ci/releasenotes/ReleaseNotesWithTypeTest.kt b/flank-scripts/src/test/kotlin/flank/scripts/ops/common/ReleaseNotesWithTypeTest.kt similarity index 97% rename from flank-scripts/src/test/kotlin/flank/scripts/ops/ci/releasenotes/ReleaseNotesWithTypeTest.kt rename to flank-scripts/src/test/kotlin/flank/scripts/ops/common/ReleaseNotesWithTypeTest.kt index d39ba65cf7..554a2c2024 100644 --- a/flank-scripts/src/test/kotlin/flank/scripts/ops/ci/releasenotes/ReleaseNotesWithTypeTest.kt +++ b/flank-scripts/src/test/kotlin/flank/scripts/ops/common/ReleaseNotesWithTypeTest.kt @@ -1,6 +1,5 @@ -package flank.scripts.ops.ci.releasenotes +package flank.scripts.ops.common -import flank.scripts.ops.common.asString import org.junit.Assert.assertEquals import org.junit.Test diff --git a/flank-scripts/src/test/kotlin/flank/scripts/ops/shell/firebase/sdk/SDKUpdateTest.kt b/flank-scripts/src/test/kotlin/flank/scripts/ops/firebase/SDKUpdateTest.kt similarity index 98% rename from flank-scripts/src/test/kotlin/flank/scripts/ops/shell/firebase/sdk/SDKUpdateTest.kt rename to flank-scripts/src/test/kotlin/flank/scripts/ops/firebase/SDKUpdateTest.kt index 28fce66dc4..eacc64bf6e 100644 --- a/flank-scripts/src/test/kotlin/flank/scripts/ops/shell/firebase/sdk/SDKUpdateTest.kt +++ b/flank-scripts/src/test/kotlin/flank/scripts/ops/firebase/SDKUpdateTest.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.shell.firebase.sdk +package flank.scripts.ops.firebase import com.google.common.truth.Truth.assertThat import flank.common.normalizeLineEnding diff --git a/flank-scripts/src/test/kotlin/flank/scripts/ops/pullrequest/FindReferenceIssueTest.kt b/flank-scripts/src/test/kotlin/flank/scripts/ops/github/FindReferenceIssueTest.kt similarity index 97% rename from flank-scripts/src/test/kotlin/flank/scripts/ops/pullrequest/FindReferenceIssueTest.kt rename to flank-scripts/src/test/kotlin/flank/scripts/ops/github/FindReferenceIssueTest.kt index 8d4fa013f4..e90f194a6b 100644 --- a/flank-scripts/src/test/kotlin/flank/scripts/ops/pullrequest/FindReferenceIssueTest.kt +++ b/flank-scripts/src/test/kotlin/flank/scripts/ops/github/FindReferenceIssueTest.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.pullrequest +package flank.scripts.ops.github import com.google.common.truth.Truth.assertThat import flank.scripts.data.github.objects.GithubPullRequest diff --git a/flank-scripts/src/test/kotlin/flank/scripts/ops/pullrequest/SetAssigneesTest.kt b/flank-scripts/src/test/kotlin/flank/scripts/ops/github/SetAssigneesTest.kt similarity index 96% rename from flank-scripts/src/test/kotlin/flank/scripts/ops/pullrequest/SetAssigneesTest.kt rename to flank-scripts/src/test/kotlin/flank/scripts/ops/github/SetAssigneesTest.kt index 7a30f7c708..495ff99126 100644 --- a/flank-scripts/src/test/kotlin/flank/scripts/ops/pullrequest/SetAssigneesTest.kt +++ b/flank-scripts/src/test/kotlin/flank/scripts/ops/github/SetAssigneesTest.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.pullrequest +package flank.scripts.ops.github import flank.scripts.FuelTestRunner import flank.scripts.testAssignees diff --git a/flank-scripts/src/test/kotlin/flank/scripts/ops/pullrequest/SetLabelsTest.kt b/flank-scripts/src/test/kotlin/flank/scripts/ops/github/SetLabelsTest.kt similarity index 96% rename from flank-scripts/src/test/kotlin/flank/scripts/ops/pullrequest/SetLabelsTest.kt rename to flank-scripts/src/test/kotlin/flank/scripts/ops/github/SetLabelsTest.kt index 10bcfcfd2d..6439a8c632 100644 --- a/flank-scripts/src/test/kotlin/flank/scripts/ops/pullrequest/SetLabelsTest.kt +++ b/flank-scripts/src/test/kotlin/flank/scripts/ops/github/SetLabelsTest.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.pullrequest +package flank.scripts.ops.github import flank.scripts.FuelTestRunner import flank.scripts.testGithubLabels diff --git a/flank-scripts/src/test/kotlin/flank/scripts/ops/integration/ProcessResultTest.kt b/flank-scripts/src/test/kotlin/flank/scripts/ops/integrationtests/ProcessResultTest.kt similarity index 98% rename from flank-scripts/src/test/kotlin/flank/scripts/ops/integration/ProcessResultTest.kt rename to flank-scripts/src/test/kotlin/flank/scripts/ops/integrationtests/ProcessResultTest.kt index 558b110594..db945d6775 100644 --- a/flank-scripts/src/test/kotlin/flank/scripts/ops/integration/ProcessResultTest.kt +++ b/flank-scripts/src/test/kotlin/flank/scripts/ops/integrationtests/ProcessResultTest.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.integration +package flank.scripts.ops.integrationtests import com.google.common.truth.Truth.assertThat import flank.common.normalizeLineEnding diff --git a/flank-scripts/src/test/kotlin/flank/scripts/ops/ci/releasenotes/AppendReleaseNotesTest.kt b/flank-scripts/src/test/kotlin/flank/scripts/ops/release/AppendReleaseNotesTest.kt similarity index 96% rename from flank-scripts/src/test/kotlin/flank/scripts/ops/ci/releasenotes/AppendReleaseNotesTest.kt rename to flank-scripts/src/test/kotlin/flank/scripts/ops/release/AppendReleaseNotesTest.kt index 4d54d466c6..67d85e6042 100644 --- a/flank-scripts/src/test/kotlin/flank/scripts/ops/ci/releasenotes/AppendReleaseNotesTest.kt +++ b/flank-scripts/src/test/kotlin/flank/scripts/ops/release/AppendReleaseNotesTest.kt @@ -1,7 +1,6 @@ -package flank.scripts.ops.ci.releasenotes +package flank.scripts.ops.release import com.google.common.truth.Truth.assertThat -import flank.scripts.ops.ci.appendReleaseNotes import flank.scripts.utils.markdownH2 import flank.scripts.utils.markdownH3 import org.junit.Test diff --git a/flank-scripts/src/test/kotlin/flank/scripts/ops/ci/NextReleaseTagGeneratorTest.kt b/flank-scripts/src/test/kotlin/flank/scripts/ops/release/NextReleaseTagGeneratorTest.kt similarity index 98% rename from flank-scripts/src/test/kotlin/flank/scripts/ops/ci/NextReleaseTagGeneratorTest.kt rename to flank-scripts/src/test/kotlin/flank/scripts/ops/release/NextReleaseTagGeneratorTest.kt index 7a97b7cbbe..2050f9c711 100644 --- a/flank-scripts/src/test/kotlin/flank/scripts/ops/ci/NextReleaseTagGeneratorTest.kt +++ b/flank-scripts/src/test/kotlin/flank/scripts/ops/release/NextReleaseTagGeneratorTest.kt @@ -1,4 +1,4 @@ -package flank.scripts.ops.ci +package flank.scripts.ops.release import com.google.common.truth.Truth.assertThat import io.mockk.every From d7a0b80f1a9a2a2333ed654add2febff6d5405c3 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 10 Feb 2021 16:16:40 +0100 Subject: [PATCH 2/2] Update MakeReleaseCommandTest.kt --- .../flank/scripts/cli/release/MakeReleaseCommandTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flank-scripts/src/test/kotlin/flank/scripts/cli/release/MakeReleaseCommandTest.kt b/flank-scripts/src/test/kotlin/flank/scripts/cli/release/MakeReleaseCommandTest.kt index 9bc71aa88a..b2b225c019 100644 --- a/flank-scripts/src/test/kotlin/flank/scripts/cli/release/MakeReleaseCommandTest.kt +++ b/flank-scripts/src/test/kotlin/flank/scripts/cli/release/MakeReleaseCommandTest.kt @@ -35,7 +35,7 @@ class MakeReleaseCommandTest { @Test fun `Should return successfully run release for snasphot`() { // given - mockkStatic("flank.scripts.ops.release.hub.ReleaseFlankKt") + mockkStatic("flank.scripts.ops.github.ReleaseFlankKt") every { releaseFlank(any(), any(), any(), any(), any()) } returns 0 // expect @@ -48,7 +48,7 @@ class MakeReleaseCommandTest { @Test fun `Should return successfully run release for stable`() { // given - mockkStatic("flank.scripts.ops.release.hub.ReleaseFlankKt") + mockkStatic("flank.scripts.ops.github.ReleaseFlankKt") every { releaseFlank(any(), any(), any(), any(), any()) } returns 0 // expect