From 6bc5c6a39ecac78b3c2e4f3dcb5a9021984ce8be Mon Sep 17 00:00:00 2001 From: piotradamczyk5 <65554637+piotradamczyk5@users.noreply.github.com> Date: Sun, 28 Mar 2021 22:43:00 +0200 Subject: [PATCH 1/2] refactor: Rename cli package (#1741) Fixes #1706 Rename package `ftl.cli.firebase.test.android.configuration` to `ftl.cli.firebase.test.android.locales` ## Test Plan > How do we know the code works? Flank build and run as usual --- .../ftl/cli/firebase/test/android/AndroidLocalesCommand.kt | 4 ++-- .../AndroidLocalesDescribeCommand.kt | 2 +- .../{configuration => locales}/AndroidLocalesListCommand.kt | 2 +- .../AndroidLocalesDescribeCommandTest.kt | 2 +- .../AndroidLocalesListCommandTest.kt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename test_runner/src/main/kotlin/ftl/cli/firebase/test/android/{configuration => locales}/AndroidLocalesDescribeCommand.kt (95%) rename test_runner/src/main/kotlin/ftl/cli/firebase/test/android/{configuration => locales}/AndroidLocalesListCommand.kt (95%) rename test_runner/src/test/kotlin/ftl/cli/firebase/test/android/{configuration => locales}/AndroidLocalesDescribeCommandTest.kt (95%) rename test_runner/src/test/kotlin/ftl/cli/firebase/test/android/{configuration => locales}/AndroidLocalesListCommandTest.kt (93%) diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidLocalesCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidLocalesCommand.kt index 248197ae9d..d1638462e6 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidLocalesCommand.kt +++ b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidLocalesCommand.kt @@ -1,7 +1,7 @@ package ftl.cli.firebase.test.android -import ftl.cli.firebase.test.android.configuration.AndroidLocalesDescribeCommand -import ftl.cli.firebase.test.android.configuration.AndroidLocalesListCommand +import ftl.cli.firebase.test.android.locales.AndroidLocalesDescribeCommand +import ftl.cli.firebase.test.android.locales.AndroidLocalesListCommand import ftl.util.PrintHelp import picocli.CommandLine diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/configuration/AndroidLocalesDescribeCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesDescribeCommand.kt similarity index 95% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/configuration/AndroidLocalesDescribeCommand.kt rename to test_runner/src/main/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesDescribeCommand.kt index e0e06456a7..1355be2b69 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/configuration/AndroidLocalesDescribeCommand.kt +++ b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesDescribeCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.android.configuration +package ftl.cli.firebase.test.android.locales import ftl.config.FtlConstants import ftl.domain.DescribeAndroidLocales diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/configuration/AndroidLocalesListCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesListCommand.kt similarity index 95% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/configuration/AndroidLocalesListCommand.kt rename to test_runner/src/main/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesListCommand.kt index 5723676dd6..6076694ba5 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/configuration/AndroidLocalesListCommand.kt +++ b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesListCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.android.configuration +package ftl.cli.firebase.test.android.locales import ftl.config.FtlConstants import ftl.domain.ListAndroidLocales diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/configuration/AndroidLocalesDescribeCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesDescribeCommandTest.kt similarity index 95% rename from test_runner/src/test/kotlin/ftl/cli/firebase/test/android/configuration/AndroidLocalesDescribeCommandTest.kt rename to test_runner/src/test/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesDescribeCommandTest.kt index 02d9af0de7..cc40141ddc 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/configuration/AndroidLocalesDescribeCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesDescribeCommandTest.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.android.configuration +package ftl.cli.firebase.test.android.locales import ftl.android.AndroidCatalog import ftl.run.exception.FlankConfigurationError diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/configuration/AndroidLocalesListCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesListCommandTest.kt similarity index 93% rename from test_runner/src/test/kotlin/ftl/cli/firebase/test/android/configuration/AndroidLocalesListCommandTest.kt rename to test_runner/src/test/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesListCommandTest.kt index 3a952c6e23..ff43199353 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/configuration/AndroidLocalesListCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesListCommandTest.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.android.configuration +package ftl.cli.firebase.test.android.locales import com.google.common.truth.Truth.assertThat import ftl.android.AndroidCatalog From 468fde3fa740813b17f184b66a8928e8ae629505 Mon Sep 17 00:00:00 2001 From: "flank-release[bot]" <73127551+flank-release[bot]@users.noreply.github.com> Date: Mon, 29 Mar 2021 07:34:48 +0200 Subject: [PATCH 2/2] build: Dependencies updates [2021-03-29] (#1744) --- buildSrc/src/main/kotlin/Versions.kt | 2 +- flank-scripts/build.gradle.kts | 2 +- flank-scripts/gradle/wrapper/gradle-wrapper.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- test_runner/gradle/wrapper/gradle-wrapper.properties | 2 +- .../src/main/kotlin/ftl/util/{CliCommand.kt => PrintHelp.kt} | 0 .../{CreateAndroidInstrumentationTestTest.kt => UtilsKtTest.kt} | 0 .../{FlankTestExceptions.kt => FlankTestNotFoundException.kt} | 0 8 files changed, 5 insertions(+), 5 deletions(-) rename test_runner/src/main/kotlin/ftl/util/{CliCommand.kt => PrintHelp.kt} (100%) rename test_runner/src/test/kotlin/ftl/gc/android/{CreateAndroidInstrumentationTestTest.kt => UtilsKtTest.kt} (100%) rename test_runner/src/test/kotlin/ftl/test/util/{FlankTestExceptions.kt => FlankTestNotFoundException.kt} (100%) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 02d559d2f5..1d2ee28cfa 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -9,7 +9,7 @@ object Versions { const val DD_PLIST = "1.23" // https://github.com/jeremymailen/kotlinter-gradle - const val KTLINT_GRADLE = "3.3.0" + const val KTLINT_GRADLE = "3.4.0" const val KTLINT = "0.40.0" diff --git a/flank-scripts/build.gradle.kts b/flank-scripts/build.gradle.kts index 6398aada47..7c164847ed 100644 --- a/flank-scripts/build.gradle.kts +++ b/flank-scripts/build.gradle.kts @@ -26,7 +26,7 @@ shadowJar.apply { } } // .. -version = "1.9.5" +version = "1.9.6" group = "com.github.flank" application { diff --git a/flank-scripts/gradle/wrapper/gradle-wrapper.properties b/flank-scripts/gradle/wrapper/gradle-wrapper.properties index 442d9132ea..e4bf89ebb8 100644 --- a/flank-scripts/gradle/wrapper/gradle-wrapper.properties +++ b/flank-scripts/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d9132ea..e4bf89ebb8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/test_runner/gradle/wrapper/gradle-wrapper.properties b/test_runner/gradle/wrapper/gradle-wrapper.properties index 8cf6eb5ad2..1d89812651 100644 --- a/test_runner/gradle/wrapper/gradle-wrapper.properties +++ b/test_runner/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/test_runner/src/main/kotlin/ftl/util/CliCommand.kt b/test_runner/src/main/kotlin/ftl/util/PrintHelp.kt similarity index 100% rename from test_runner/src/main/kotlin/ftl/util/CliCommand.kt rename to test_runner/src/main/kotlin/ftl/util/PrintHelp.kt diff --git a/test_runner/src/test/kotlin/ftl/gc/android/CreateAndroidInstrumentationTestTest.kt b/test_runner/src/test/kotlin/ftl/gc/android/UtilsKtTest.kt similarity index 100% rename from test_runner/src/test/kotlin/ftl/gc/android/CreateAndroidInstrumentationTestTest.kt rename to test_runner/src/test/kotlin/ftl/gc/android/UtilsKtTest.kt diff --git a/test_runner/src/test/kotlin/ftl/test/util/FlankTestExceptions.kt b/test_runner/src/test/kotlin/ftl/test/util/FlankTestNotFoundException.kt similarity index 100% rename from test_runner/src/test/kotlin/ftl/test/util/FlankTestExceptions.kt rename to test_runner/src/test/kotlin/ftl/test/util/FlankTestNotFoundException.kt