Reorganized ops

Flank · Feb 8, 2021 · 8f1c127 · 8f1c127
1 parent d81844f
commit 8f1c127
Show file tree

Hide file tree

Showing 24 changed files with 27 additions and 24 deletions.
diff --git a/flank-scripts/build.gradle.kts b/flank-scripts/build.gradle.kts
@@ -28,7 +28,7 @@ shadowJar.apply {
     }
 }
 // <breaking change>.<feature added>.<fix/minor change>
-version = "1.5.1"
+version = "1.5.2"
 group = "com.github.flank"
 
 application {

diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/shell/BuildFtlCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/shell/BuildFtlCommand.kt
@@ -1,7 +1,7 @@
 package flank.scripts.cli.shell
 
 import com.github.ajalt.clikt.core.CliktCommand
-import flank.scripts.ops.shell.ios.buildFtl
+import flank.scripts.ops.shell.buildexample.ios.buildFtl
 
 object BuildFtlCommand : CliktCommand(
     name = "iosBuildFtl",

diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/shell/RunFtlLocalCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/shell/RunFtlLocalCommand.kt
@@ -3,7 +3,7 @@ package flank.scripts.cli.shell
 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.ios.runFtlLocal
+import flank.scripts.ops.shell.buildexample.ios.runFtlLocal
 
 object RunFtlLocalCommand : CliktCommand(
     name = "iosRunFtlLocal",

diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/shell/UniversalFrameworkCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/shell/UniversalFrameworkCommand.kt
@@ -1,7 +1,7 @@
 package flank.scripts.cli.shell
 
 import com.github.ajalt.clikt.core.CliktCommand
-import flank.scripts.ops.shell.ios.createUniversalFrameworkFiles
+import flank.scripts.ops.shell.buildexample.ios.createUniversalFrameworkFiles
 
 object UniversalFrameworkCommand : CliktCommand(
     name = "iosUniversalFramework",

diff --git a/flank-scripts/src/main/kotlin/flank/scripts/cli/shell/buildexample/BuildExampleCommand.kt b/flank-scripts/src/main/kotlin/flank/scripts/cli/shell/buildexample/BuildExampleCommand.kt
@@ -1,7 +1,7 @@
 package flank.scripts.cli.shell.buildexample
 
 import com.github.ajalt.clikt.core.CliktCommand
-import flank.scripts.ops.shell.ios.buildIosExample
+import flank.scripts.ops.shell.buildexample.ios.buildIosExample
 
 object BuildExampleCommand : CliktCommand(
     name = "iosBuildExample",

diff --git a/...ops/ci/releasenotes/AppendReleaseNotes.kt → ...lank/scripts/ops/ci/AppendReleaseNotes.kt b/...ops/ci/releasenotes/AppendReleaseNotes.kt → ...lank/scripts/ops/ci/AppendReleaseNotes.kt
@@ -1,6 +1,8 @@
-package flank.scripts.ops.ci.releasenotes
+package flank.scripts.ops.ci
 
 import flank.common.withNewLineAtTheEnd
+import flank.scripts.ops.common.ReleaseNotesWithType
+import flank.scripts.ops.common.asString
 import java.io.File
 
 fun File.appendReleaseNotes(releaseNotesWithType: ReleaseNotesWithType, releaseTag: String) {

diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/ci/CreateReleaseNotes.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/ci/CreateReleaseNotes.kt
@@ -3,8 +3,7 @@ package flank.scripts.ops.ci
 import com.github.kittinunf.result.map
 import com.github.kittinunf.result.success
 import flank.scripts.data.github.getLatestReleaseTag
-import flank.scripts.ops.ci.releasenotes.appendReleaseNotes
-import flank.scripts.ops.ci.releasenotes.generateReleaseNotes
+import flank.scripts.ops.common.generateReleaseNotes
 import kotlinx.coroutines.runBlocking
 import java.io.File
 

diff --git a/...leasenotes/ConventionalCommitFormatter.kt → ...ops/common/ConventionalCommitFormatter.kt b/...leasenotes/ConventionalCommitFormatter.kt → ...ops/common/ConventionalCommitFormatter.kt
@@ -1,4 +1,4 @@
-package flank.scripts.ops.ci.releasenotes
+package flank.scripts.ops.common
 
 fun String.mapPrTitleWithType() = when {
     startsWith("feat") -> "Features" to skipConventionalCommitPrefix().capitalize()

diff --git a/...buildexample/ios/EarlGreyExampleConsts.kt → ...ripts/ops/common/EarlGreyExampleConsts.kt b/...buildexample/ios/EarlGreyExampleConsts.kt → ...ripts/ops/common/EarlGreyExampleConsts.kt
@@ -1,4 +1,4 @@
-package flank.scripts.ops.shell.buildexample.ios
+package flank.scripts.ops.common
 
 const val EARL_GREY_EXAMPLE = "EarlGreyExample"
 const val EARL_GREY_EXAMPLE_TESTS = "EarlGreyExampleTests"

diff --git a/.../ops/ci/releasenotes/GenerateChangeLog.kt → ...k/scripts/ops/common/GenerateChangeLog.kt b/.../ops/ci/releasenotes/GenerateChangeLog.kt → ...k/scripts/ops/common/GenerateChangeLog.kt
@@ -1,4 +1,4 @@
-package flank.scripts.ops.ci.releasenotes
+package flank.scripts.ops.common
 
 import com.github.kittinunf.result.Result
 import com.github.kittinunf.result.getOrElse

diff --git a/...s/ci/releasenotes/ReleaseNotesWithType.kt → ...cripts/ops/common/ReleaseNotesWithType.kt b/...s/ci/releasenotes/ReleaseNotesWithType.kt → ...cripts/ops/common/ReleaseNotesWithType.kt
@@ -1,4 +1,4 @@
-package flank.scripts.ops.ci.releasenotes
+package flank.scripts.ops.common
 
 import flank.scripts.utils.markdownH2
 import flank.scripts.utils.markdownH3

diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/release/hub/ReleaseFlank.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/release/hub/ReleaseFlank.kt
@@ -1,8 +1,8 @@
 package flank.scripts.ops.release.hub
 
 import com.google.common.annotations.VisibleForTesting
-import flank.scripts.ops.ci.releasenotes.asString
-import flank.scripts.ops.ci.releasenotes.generateReleaseNotes
+import flank.scripts.ops.common.asString
+import flank.scripts.ops.common.generateReleaseNotes
 import flank.scripts.utils.ERROR_WHEN_RUNNING
 import flank.scripts.utils.runCommand
 import java.io.File

diff --git a/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/SetupIosEnv.kt b/flank-scripts/src/main/kotlin/flank/scripts/ops/shell/SetupIosEnv.kt
@@ -1,7 +1,7 @@
 package flank.scripts.ops.shell
 
 import flank.common.iOSTestProjectsPath
-import flank.scripts.ops.shell.buildexample.ios.EARL_GREY_EXAMPLE
+import flank.scripts.ops.common.EARL_GREY_EXAMPLE
 import flank.scripts.utils.downloadCocoaPodsIfNeeded
 import flank.scripts.utils.failIfWindows
 import flank.scripts.utils.installPodsIfNeeded

diff --git a/...-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildEarlGreyExample.kt b/...-scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildEarlGreyExample.kt
@@ -1,6 +1,9 @@
 package flank.scripts.ops.shell.buildexample.ios
 
 import flank.common.iOSTestProjectsPath
+import flank.scripts.ops.common.EARL_GREY_EXAMPLE
+import flank.scripts.ops.common.EARL_GREY_EXAMPLE_SWIFT_TESTS
+import flank.scripts.ops.common.EARL_GREY_EXAMPLE_TESTS
 import flank.scripts.utils.failIfWindows
 import java.nio.file.Paths
 

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/shell/buildexample/ios/BuildExample.kt
@@ -1,4 +1,4 @@
-package flank.scripts.ops.shell.ios
+package flank.scripts.ops.shell.buildexample.ios
 
 import flank.common.archive
 import flank.common.currentPath

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/shell/buildexample/ios/BuildFtl.kt
@@ -1,4 +1,4 @@
-package flank.scripts.ops.shell.ios
+package flank.scripts.ops.shell.buildexample.ios
 
 import flank.common.archive
 import flank.scripts.utils.downloadXcPrettyIfNeeded

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/shell/buildexample/ios/BuildIosIPA.kt
@@ -1,8 +1,6 @@
 package flank.scripts.ops.shell.buildexample.ios
 
 import flank.common.flankFixturesIosTmpPath
-import flank.scripts.ops.shell.ios.createXcodeArchiveCommand
-import flank.scripts.ops.shell.ios.createXcodeExportArchiveCommand
 import flank.scripts.utils.downloadCocoaPodsIfNeeded
 import flank.scripts.utils.downloadXcPrettyIfNeeded
 import flank.scripts.utils.installPodsIfNeeded

diff --git a/...scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildIosTestArtifacts.kt b/...scripts/src/main/kotlin/flank/scripts/ops/shell/buildexample/ios/BuildIosTestArtifacts.kt
@@ -2,7 +2,6 @@ package flank.scripts.ops.shell.buildexample.ios
 
 import flank.common.archive
 import flank.common.flankFixturesIosTmpPath
-import flank.scripts.ops.shell.ios.createXcodeBuildForTestingCommand
 import flank.scripts.utils.downloadCocoaPodsIfNeeded
 import flank.scripts.utils.downloadXcPrettyIfNeeded
 import flank.scripts.utils.installPodsIfNeeded

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/shell/buildexample/ios/IosBuildCommand.kt
@@ -1,4 +1,4 @@
-package flank.scripts.ops.shell.ios
+package flank.scripts.ops.shell.buildexample.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/shell/buildexample/ios/LipoHelper.kt
@@ -1,4 +1,4 @@
-package flank.scripts.ops.shell.ios
+package flank.scripts.ops.shell.buildexample.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/shell/buildexample/ios/RunFtlLocal.kt
@@ -1,4 +1,4 @@
-package flank.scripts.ops.shell.ios
+package flank.scripts.ops.shell.buildexample.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/shell/buildexample/ios/UniversalFramework.kt
@@ -1,4 +1,4 @@
-package flank.scripts.ops.shell.ios
+package flank.scripts.ops.shell.buildexample.ios
 
 import flank.common.currentPath
 import flank.scripts.utils.failIfWindows

diff --git a/...ipts/src/test/kotlin/flank/scripts/ops/ci/releasenotes/ConventionalCommitFormatterTest.kt b/...ipts/src/test/kotlin/flank/scripts/ops/ci/releasenotes/ConventionalCommitFormatterTest.kt
@@ -1,6 +1,7 @@
 package flank.scripts.ops.ci.releasenotes
 
 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/ci/releasenotes/ReleaseNotesWithTypeTest.kt
@@ -1,5 +1,6 @@
 package flank.scripts.ops.ci.releasenotes
 
+import flank.scripts.ops.common.asString
 import org.junit.Assert.assertEquals
 import org.junit.Test