refactor: Move function to files which use them (#1589)

docs/flank-scripts/README.md

@@ -205,7 +205,6 @@ Properties are skipped by git and should not be attached to a commit. Note, the
 │   ├── assemble
 │   │   ├── BuildFlank.kt
 │   │   ├── BuildGo.kt
-│   │   ├── GradleCommand.kt
 │   │   ├── android
 │   │   │   ├── BuildBaseAndroidApk.kt
 │   │   │   ├── BuildBaseAndroidTests.kt
@@ -224,101 +223,77 @@ Properties are skipped by git and should not be attached to a commit. Note, the
 │   │       ├── BuildIosTestArtifacts.kt
 │   │       ├── BuildTestPlansExample.kt
 │   │       ├── IosBuildCommand.kt
-│   │       ├── LipoHelper.kt
 │   │       ├── RunFtlLocal.kt
 │   │       └── UniversalFramework.kt
-│   ├── ci
 │   ├── common
-│   │   ├── ConventionalCommitFormatter.kt
+│   │   ├── DownloadSoftware.kt
 │   │   ├── EarlGreyExampleConsts.kt
 │   │   ├── GenerateChangeLog.kt
 │   │   └── ReleaseNotesWithType.kt
-│   ├── contribution
 │   ├── 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
-│   │   └── updatebinaries
-│   │       ├── UpdateAtomic.kt
-│   │       ├── UpdateBinaries.kt
-│   │       ├── UpdateLlvm.kt
-│   │       └── UpdateSwift.kt
+│   │   └── common
+│   │       ├── DependenciesResultCheck.kt
+│   │       ├── DependencyExtensions.kt
+│   │       ├── DependencyUpdate.kt
+│   │       ├── FindOutdatedDependencies.kt
+│   │       ├── GradleDependency.kt
+│   │       ├── UpdateDependencies.kt
+│   │       ├── UpdateGradle.kt
+│   │       ├── UpdatePlugins.kt
+│   │       └── UpdateVersionsInFile.kt
 │   ├── firebase
-│   │   ├── CheckForSDKUpdateCommand.kt
+│   │   ├── CheckForSDKUpdate.kt
 │   │   ├── CommitList.kt
-│   │   ├── Extensions.kt
 │   │   ├── GenerateJavaClient.kt
-│   │   ├── LastSDKUpdateRun.kt
-│   │   ├── OpenedUpdates.kt
 │   │   ├── SDKUpdateContext.kt
-│   │   └── UpdateApiJson.kt
+│   │   ├── UpdateApiJson.kt
+│   │   └── common
+│   │       └── Extensions.kt
 │   ├── github
 │   │   ├── CopyGitHubProperties.kt
 │   │   ├── DeleteOldRelease.kt
 │   │   ├── DeleteOldTag.kt
-│   │   ├── FindReferenceIssue.kt
-│   │   ├── ReleaseFlank.kt
-│   │   ├── SetAssignees.kt
-│   │   └── SetLabels.kt
-│   ├── integration
+│   │   └── ReleaseFlank.kt
 │   ├── integrationtests
-│   │   ├── CommitList.kt
-│   │   ├── Extensions.kt
-│   │   ├── IntegrationContext.kt
-│   │   ├── IssueList.kt
-│   │   ├── PrepareMessage.kt
 │   │   ├── ProcessIntegrationTestsResult.kt
-│   │   └── WorkflowSummary.kt
+│   │   └── common
+│   │       ├── ITResults.kt
+│   │       ├── IntegrationContext.kt
+│   │       └── PrepareMessage.kt
+│   ├── jfrog
+│   │   ├── DeleteOldSnapshot.kt
+│   │   ├── JFrogCommandHelper.kt
+│   │   └── SyncMaven.kt
 │   ├── linter
 │   │   ├── ApplyKtlintToIdea.kt
 │   │   └── LinkGitHooks.kt
-│   ├── pullrequest
 │   ├── release
-│   │   ├── AppendReleaseNotes.kt
 │   │   ├── CreateReleaseNotes.kt
-│   │   ├── NextReleaseTag.kt
-│   │   ├── hub
-│   │   └── jfrog
-│   │       ├── DeleteOldSnapshot.kt
-│   │       ├── JFrogCommandHelper.kt
-│   │       └── SyncMaven.kt
-│   ├── shell
-│   │   ├── buildexample
-│   │   │   ├── android
-│   │   │   ├── go
-│   │   │   └── ios
-│   │   ├── firebase
-│   │   │   ├── apiclient
-│   │   │   └── sdk
-│   │   └── updatebinaries
-│   └── 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
+│   │   └── NextReleaseTag.kt
+│   ├── testartifacts
+│   │   ├── ArtifactsArchive.kt
+│   │   ├── Context.kt
+│   │   ├── DownloadFixtures.kt
+│   │   ├── Helpers.kt
+│   │   ├── LinkArtifacts.kt
+│   │   ├── PrepareTestArtifacts.kt
+│   │   ├── RemoveRemoteCopy.kt
+│   │   ├── ResolveArtifacts.kt
+│   │   ├── UploadFixtures.kt
+│   │   └── ZipArtifacts.kt
+│   └── updatebinaries
+│       ├── UpdateAtomic.kt
+│       ├── UpdateBinaries.kt
+│       ├── UpdateLlvm.kt
+│       └── UpdateSwift.kt
 └── utils
     ├── Env.kt
     ├── FastFailForWindows.kt
     ├── Git.kt
+    ├── GradleCommand.kt
     ├── MarkdownFormatter.kt
     ├── Path.kt
     ├── Serialization.kt

flank-scripts/build.gradle.kts

@@ -28,7 +28,7 @@ shadowJar.apply {
     }
 }
 // <breaking change>.<feature added>.<fix/minor change>
-version = "1.6.1"
+version = "1.6.2"
 group = "com.github.flank"
 
 application {

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.dependencies.updatebinaries.updateBinaries
+import flank.scripts.ops.updatebinaries.updateBinaries
 
 object UpdateBinariesCommand : CliktCommand(
     name = "update_binaries",

flank-scripts/src/main/kotlin/flank/scripts/cli/integrationtests/ProcessResultCommand.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.github.ajalt.clikt.parameters.types.enum
-import flank.scripts.ops.integrationtests.ITResults
+import flank.scripts.ops.integrationtests.common.ITResults
 import flank.scripts.ops.integrationtests.processIntegrationTestsResult
 
 object ProcessResultCommand : CliktCommand(

flank-scripts/src/main/kotlin/flank/scripts/cli/release/DeleteSnapshotCommand.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.release.jfrog.jFrogDeleteOldSnapshot
+import flank.scripts.ops.jfrog.jFrogDeleteOldSnapshot
 
 object DeleteSnapshotCommand : CliktCommand(
     name = "delete_snapshot",

flank-scripts/src/main/kotlin/flank/scripts/cli/release/SyncWithMavenCentralCommand.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.release.jfrog.jFrogSync
+import flank.scripts.ops.jfrog.jFrogSync
 import kotlin.system.exitProcess
 
 object SyncWithMavenCentralCommand : CliktCommand(

flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildExample.kt

@@ -3,8 +3,8 @@ package flank.scripts.ops.assemble.ios
 import flank.common.archive
 import flank.common.currentPath
 import flank.common.iOSTestProjectsPath
-import flank.scripts.ops.dependencies.downloadXcPrettyIfNeeded
-import flank.scripts.ops.dependencies.installPodsIfNeeded
+import flank.scripts.ops.common.downloadXcPrettyIfNeeded
+import flank.scripts.ops.common.installPodsIfNeeded
 import flank.scripts.utils.failIfWindows
 import flank.scripts.utils.pipe
 import java.nio.file.Files

flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildFtl.kt

@@ -1,7 +1,7 @@
 package flank.scripts.ops.assemble.ios
 
 import flank.common.archive
-import flank.scripts.ops.dependencies.downloadXcPrettyIfNeeded
+import flank.scripts.ops.common.downloadXcPrettyIfNeeded
 import flank.scripts.utils.failIfWindows
 import flank.scripts.utils.pipe
 import java.nio.file.Files

flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildIosIPA.kt

@@ -1,9 +1,9 @@
 package flank.scripts.ops.assemble.ios
 
 import flank.common.flankFixturesIosTmpPath
-import flank.scripts.ops.dependencies.downloadCocoaPodsIfNeeded
-import flank.scripts.ops.dependencies.downloadXcPrettyIfNeeded
-import flank.scripts.ops.dependencies.installPodsIfNeeded
+import flank.scripts.ops.common.downloadCocoaPodsIfNeeded
+import flank.scripts.ops.common.downloadXcPrettyIfNeeded
+import flank.scripts.ops.common.installPodsIfNeeded
 import flank.scripts.utils.pipe
 import java.nio.file.Path
 import java.nio.file.Paths

flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/BuildIosTestArtifacts.kt

@@ -2,9 +2,9 @@ package flank.scripts.ops.assemble.ios
 
 import flank.common.archive
 import flank.common.flankFixturesIosTmpPath
-import flank.scripts.ops.dependencies.downloadCocoaPodsIfNeeded
-import flank.scripts.ops.dependencies.downloadXcPrettyIfNeeded
-import flank.scripts.ops.dependencies.installPodsIfNeeded
+import flank.scripts.ops.common.downloadCocoaPodsIfNeeded
+import flank.scripts.ops.common.downloadXcPrettyIfNeeded
+import flank.scripts.ops.common.installPodsIfNeeded
 import flank.scripts.utils.pipe
 import java.io.File
 import java.nio.file.Path

flank-scripts/src/main/kotlin/flank/scripts/ops/assemble/ios/UniversalFramework.kt

@@ -39,6 +39,11 @@ fun createUniversalFrameworkFiles() {
     )
 }
 
+fun createLipoCommand(
+    outputPath: String,
+    vararg files: String
+) = "lipo -create ${files.joinToString(" ")} -output $outputPath"
+
 private fun copyAppFrameworkFiles(fromPath: String, toPath: String) {
     Paths.get(fromPath, APP_FRAMEWORK_FRAMEWORK).toFile()
         .copyRecursively(Paths.get(toPath, APP_FRAMEWORK_FRAMEWORK).toFile(), overwrite = true)

flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/DownloadSoftware.kt → flank-scripts/src/main/kotlin/flank/scripts/ops/common/DownloadSoftware.kt

@@ -1,7 +1,6 @@
-package flank.scripts.ops.dependencies
+package flank.scripts.ops.common
 
 import flank.scripts.utils.checkAndInstallIfNeed
-import flank.scripts.utils.commandInstalledOr
 import flank.scripts.utils.runCommand
 import java.nio.file.Path
 
@@ -17,17 +16,3 @@ fun installPodsIfNeeded(path: Path) {
     if (path.toFile().listFiles().map { it.name }.contains("Podfile"))
         "pod install --project-directory=$path --verbose".runCommand()
 }
-
-fun checkIfPipInstalled() {
-    "pip".commandInstalledOr {
-        println("You need pip fot this script. To install it follow https://pip.pypa.io/en/stable/installing/")
-    }
-}
-
-fun downloadSortJsonIfNeeded() {
-    "sort-json".checkAndInstallIfNeed("npm -g install sort-json")
-}
-
-fun installClientGeneratorIfNeeded() {
-    "generate_library".checkAndInstallIfNeed("pip install google-apis-client-generator")
-}

flank-scripts/src/main/kotlin/flank/scripts/ops/common/GenerateChangeLog.kt

@@ -57,4 +57,17 @@ private fun GithubPullRequest.toReleaseNoteMessage() =
         type to "- ${markdownLink("#$number", htmlUrl)} $title ${assignees.format()}"
     }
 
+internal fun String.mapPrTitleWithType() = when {
+    startsWith("feat") -> "Features" to skipConventionalCommitPrefix().capitalize()
+    startsWith("fix") -> "Bug Fixes" to skipConventionalCommitPrefix().capitalize()
+    startsWith("docs") -> "Documentation" to skipConventionalCommitPrefix().capitalize()
+    startsWith("refactor") -> "Refactor" to skipConventionalCommitPrefix().capitalize()
+    startsWith("ci") -> "CI Changes" to skipConventionalCommitPrefix().capitalize()
+    startsWith("test") -> "Tests update" to skipConventionalCommitPrefix().capitalize()
+    startsWith("perf") -> "Performance upgrade" to skipConventionalCommitPrefix().capitalize()
+    else -> null // we do not accept other prefix to have update in release notes
+}
+
+private fun String.skipConventionalCommitPrefix() = substring(indexOf(':') + 2)
+
 private fun List<GithubUser>.format() = "(${joinToString { (login, url) -> markdownLink(login, url) }})"

flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/InstallXcPretty.kt

@@ -1,5 +1,6 @@
 package flank.scripts.ops.dependencies
 
+import flank.scripts.ops.common.downloadXcPrettyIfNeeded
 import flank.scripts.utils.failIfWindows
 
 fun installXcPretty() {

flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/SetupIosEnv.kt

@@ -2,6 +2,8 @@ package flank.scripts.ops.dependencies
 
 import flank.common.iOSTestProjectsPath
 import flank.scripts.ops.common.EARL_GREY_EXAMPLE
+import flank.scripts.ops.common.downloadCocoaPodsIfNeeded
+import flank.scripts.ops.common.installPodsIfNeeded
 import flank.scripts.utils.failIfWindows
 import java.nio.file.Paths
 

flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/DependenciesResultCheck.kt → flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/common/DependenciesResultCheck.kt

@@ -1,4 +1,4 @@
-package flank.scripts.ops.dependencies
+package flank.scripts.ops.dependencies.common
 
 import flank.scripts.utils.Version
 import kotlinx.serialization.SerialName

flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/DependencyExtensions.kt → flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/common/DependencyExtensions.kt

@@ -1,11 +1,9 @@
 package flank.scripts.ops.dependencies
 
-val Dependency.groupWithName get() = "$group:$name:"
+import flank.scripts.ops.dependencies.common.Dependency
 
 val Dependency.versionToUpdate
     get() = availableVersion?.release
         ?: availableVersion?.milestone
         ?: availableVersion?.integration
         ?: version
-
-fun GradleDependency.needsUpdate() = running.version < current.version || running.version < releaseCandidate.version

flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/DependencyUpdate.kt → flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/common/DependencyUpdate.kt

@@ -1,4 +1,4 @@
-package flank.scripts.ops.dependencies
+package flank.scripts.ops.dependencies.common
 
 import flank.scripts.utils.Version
 

flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/FindOutdatedDependencies.kt → flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/common/FindOutdatedDependencies.kt

@@ -1,8 +1,6 @@
-package flank.scripts.ops.dependencies
+package flank.scripts.ops.dependencies.common
 
 import flank.scripts.utils.toObject
 import java.io.File
 
 fun File.outDatedDependencies() = readText().toObject<DependenciesResultCheck>().outdated.dependencies
-
-fun File.gradleDependency() = readText().toObject<DependenciesResultCheck>().gradle

flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/GradleDependency.kt → flank-scripts/src/main/kotlin/flank/scripts/ops/dependencies/common/GradleDependency.kt

@@ -1,4 +1,4 @@
-package flank.scripts.ops.dependencies
+package flank.scripts.ops.dependencies.common
 
 import flank.scripts.utils.Version
 import kotlinx.serialization.Serializable