From 397acebf79f6ac252692dbff6c3cdc4e505e92c0 Mon Sep 17 00:00:00 2001 From: dankito Date: Tue, 8 Sep 2020 00:23:12 +0200 Subject: [PATCH] Extracted iOSIsRealDevice so that it's easier to switch between iOS Simulator and real device --- build.gradle | 5 +++++ common/build.gradle | 3 --- fints4k/build.gradle | 1 - tools/BankFinder/build.gradle | 1 - ui/BankingUiCommon/build.gradle | 1 - ui/BankingUiNativeIntegration/build.gradle | 4 +--- ui/fints4kBankingClient/build.gradle | 1 - 7 files changed, 6 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index fd395b2e..839be3dd 100644 --- a/build.gradle +++ b/build.gradle @@ -30,6 +30,11 @@ ext { hbci4jVersion = '3.1.37' + /* iOS */ + + iOSIsRealDevice = false + + /* Android */ androidCompileSdkVersion = 28 diff --git a/common/build.gradle b/common/build.gradle index f948257f..0f9dacb5 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -16,11 +16,8 @@ kotlin { } targets { - // Select iOS target for real device or emulator. - final def iOSIsRealDevice = System.getenv('SDK_NAME')?.startsWith("iphoneos") final def iOSTarget = iOSIsRealDevice ? presets.iosArm64 : presets.iosX64 - // iOS target. fromPreset(iOSTarget, 'ios') { binaries { framework { diff --git a/fints4k/build.gradle b/fints4k/build.gradle index 1a6325f8..adf425eb 100644 --- a/fints4k/build.gradle +++ b/fints4k/build.gradle @@ -23,7 +23,6 @@ kotlin { targets { // Select iOS target for real device or emulator. - final def iOSIsRealDevice = System.getenv('SDK_NAME')?.startsWith("iphoneos") final def iOSTarget = iOSIsRealDevice ? presets.iosArm64 : presets.iosX64 // iOS target. diff --git a/tools/BankFinder/build.gradle b/tools/BankFinder/build.gradle index 85433765..1069937c 100644 --- a/tools/BankFinder/build.gradle +++ b/tools/BankFinder/build.gradle @@ -17,7 +17,6 @@ kotlin { targets { // Select iOS target for real device or emulator. - final def iOSIsRealDevice = System.getenv('SDK_NAME')?.startsWith("iphoneos") final def iOSTarget = iOSIsRealDevice ? presets.iosArm64 : presets.iosX64 // iOS target. diff --git a/ui/BankingUiCommon/build.gradle b/ui/BankingUiCommon/build.gradle index 70af75f9..69926251 100644 --- a/ui/BankingUiCommon/build.gradle +++ b/ui/BankingUiCommon/build.gradle @@ -17,7 +17,6 @@ kotlin { targets { // Select iOS target for real device or emulator. - final def iOSIsRealDevice = System.getenv('SDK_NAME')?.startsWith("iphoneos") final def iOSTarget = iOSIsRealDevice ? presets.iosArm64 : presets.iosX64 // iOS target. diff --git a/ui/BankingUiNativeIntegration/build.gradle b/ui/BankingUiNativeIntegration/build.gradle index ca1d3dff..c29d1da6 100644 --- a/ui/BankingUiNativeIntegration/build.gradle +++ b/ui/BankingUiNativeIntegration/build.gradle @@ -8,12 +8,10 @@ ext.artifactName = "banking-ui-native-integration" kotlin { + targets { - // Select iOS target for real device or emulator. - final def iOSIsRealDevice = System.getenv('SDK_NAME')?.startsWith("iphoneos") final def iOSTarget = iOSIsRealDevice ? presets.iosArm64 : presets.iosX64 - // iOS target. fromPreset(iOSTarget, 'ios') { binaries { framework { diff --git a/ui/fints4kBankingClient/build.gradle b/ui/fints4kBankingClient/build.gradle index 93fcd262..4d7cf2c2 100644 --- a/ui/fints4kBankingClient/build.gradle +++ b/ui/fints4kBankingClient/build.gradle @@ -17,7 +17,6 @@ kotlin { targets { // Select iOS target for real device or emulator. - final def iOSIsRealDevice = System.getenv('SDK_NAME')?.startsWith("iphoneos") final def iOSTarget = iOSIsRealDevice ? presets.iosArm64 : presets.iosX64 // iOS target.