Merge branch 'master' into #1686-IT-tests

Flank · Mar 29, 2021 · 6be5853 · 6be5853
2 parents 221fef6 + 468fde3
commit 6be5853
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -26,7 +26,7 @@ shadowJar.apply {
     }
 }
 // <breaking change>.<feature added>.<fix/minor change>
-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
@@ -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
@@ -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
@@ -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/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/...guration/AndroidLocalesDescribeCommand.kt → .../locales/AndroidLocalesDescribeCommand.kt b/...guration/AndroidLocalesDescribeCommand.kt → .../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/...onfiguration/AndroidLocalesListCommand.kt → ...roid/locales/AndroidLocalesListCommand.kt b/...onfiguration/AndroidLocalesListCommand.kt → ...roid/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/...er/src/main/kotlin/ftl/util/CliCommand.kt → ...ner/src/main/kotlin/ftl/util/PrintHelp.kt b/...er/src/main/kotlin/ftl/util/CliCommand.kt → ...ner/src/main/kotlin/ftl/util/PrintHelp.kt
diff --git a/...tion/AndroidLocalesDescribeCommandTest.kt → ...ales/AndroidLocalesDescribeCommandTest.kt b/...tion/AndroidLocalesDescribeCommandTest.kt → ...ales/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/...guration/AndroidLocalesListCommandTest.kt → .../locales/AndroidLocalesListCommandTest.kt b/...guration/AndroidLocalesListCommandTest.kt → .../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

diff --git a/...d/CreateAndroidInstrumentationTestTest.kt → ...test/kotlin/ftl/gc/android/UtilsKtTest.kt b/...d/CreateAndroidInstrumentationTestTest.kt → ...test/kotlin/ftl/gc/android/UtilsKtTest.kt
diff --git a/...tlin/ftl/test/util/FlankTestExceptions.kt → ...l/test/util/FlankTestNotFoundException.kt b/...tlin/ftl/test/util/FlankTestExceptions.kt → ...l/test/util/FlankTestNotFoundException.kt