From 3da60a3229a6899f0a9f65ee5f0e8f8f46d95ba6 Mon Sep 17 00:00:00 2001 From: Piotr Adamczyk Date: Mon, 19 Oct 2020 15:53:30 +0200 Subject: [PATCH] code style changes --- flank-bash/scripts/ios.ops.main.kts | 2 -- flank-bash/scripts/ios/buildExample.main.kts | 1 - flank-bash/scripts/updateFirebaseApi/updateApiJson.main.kts | 2 -- flank-bash/scripts/util/archive.main.kts | 4 ++-- flank-bash/scripts/util/downloadSoftware.main.kts | 2 +- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/flank-bash/scripts/ios.ops.main.kts b/flank-bash/scripts/ios.ops.main.kts index c2c13844b0..2719e26f83 100644 --- a/flank-bash/scripts/ios.ops.main.kts +++ b/flank-bash/scripts/ios.ops.main.kts @@ -15,7 +15,6 @@ import java.nio.file.Path import java.nio.file.Paths import java.nio.file.StandardCopyOption - val debugIphoneOs = "Debug-iphoneos" val earlGreyExampleSwift = "EarlGreyExampleSwift.app" val plugins = "PlugIns" @@ -49,7 +48,6 @@ suspend fun buildEarlGreyExample() = buildDirectoryPath.runBuilds().resolve("Pro filterFilesToCopy().copyIosProductFiles() }.copyTestFiles() - val buildDirectoryPath = Paths.get(iOSTestProjectsPath, earlGreyExample, buildDirectory) suspend fun Path.runBuilds() = toFile().let { projectPath -> diff --git a/flank-bash/scripts/ios/buildExample.main.kts b/flank-bash/scripts/ios/buildExample.main.kts index 96a52b650a..3704955460 100644 --- a/flank-bash/scripts/ios/buildExample.main.kts +++ b/flank-bash/scripts/ios/buildExample.main.kts @@ -31,7 +31,6 @@ val buildProductPath = Paths.get(dataPath.toString(), "Build", "Products") downloadXcPrettyIfNeeded() shell { - val xcodeCommandSwiftTests = createIosBuildCommand(dataPath.toString(), "./EarlGreyExample.xcworkspace", "EarlGreyExampleSwiftTests") val xcPrettyCommand = "xcpretty".process() diff --git a/flank-bash/scripts/updateFirebaseApi/updateApiJson.main.kts b/flank-bash/scripts/updateFirebaseApi/updateApiJson.main.kts index 3c3de57212..6839eb85c3 100644 --- a/flank-bash/scripts/updateFirebaseApi/updateApiJson.main.kts +++ b/flank-bash/scripts/updateFirebaseApi/updateApiJson.main.kts @@ -34,5 +34,3 @@ shell { "sort-json $testingV1Path"() "sort-json $testingV1Beta3Path"() } - - diff --git a/flank-bash/scripts/util/archive.main.kts b/flank-bash/scripts/util/archive.main.kts index 850dcfe838..32c5ab58c8 100644 --- a/flank-bash/scripts/util/archive.main.kts +++ b/flank-bash/scripts/util/archive.main.kts @@ -16,7 +16,7 @@ fun File.extract( } else { ArchiverFactory.createArchiver(archiveFormat) } - kotlin.runCatching { + runCatching { archiver.extract(this, destination) }.onFailure { println("There was an error when unpacking $name - $it") @@ -34,7 +34,7 @@ fun File.extract( } else { ArchiverFactory.createArchiver(archiveFormat) } - kotlin.runCatching { + runCatching { archiver.extract(this, destination) }.onFailure { println("There was an error when unpacking $name - $it") diff --git a/flank-bash/scripts/util/downloadSoftware.main.kts b/flank-bash/scripts/util/downloadSoftware.main.kts index ab636c5c69..1db0d59a2c 100644 --- a/flank-bash/scripts/util/downloadSoftware.main.kts +++ b/flank-bash/scripts/util/downloadSoftware.main.kts @@ -36,7 +36,7 @@ fun downloadCocoaPodsIfNeeded() { } suspend fun Shell.installPods(path: Path) { - kotlin.runCatching { "pod install --project-directory=$path --verbose"() } + runCatching { "pod install --project-directory=$path --verbose"() } } fun checkIfPipInstalled() {