isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 17:18:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update to K/N 1.3.72; remove i18n classes; rewrite sprintf

Browse Source
This commit is contained in:
Alinson S. Xavier
2020-05-17 11:47:13 -05:00
parent 58d8c799ce
commit 6a172d135b
46 changed files with 86 additions and 5572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
core/build.gradle
View File

@@ -18,7 +18,7 @@
*/
plugins {
id 'kotlin-multiplatform' version '1.3.21'
id 'kotlin-multiplatform' version "1.3.72"
}
repositories {
@@ -32,7 +32,9 @@ kotlin {
def iosPreset = isIphone ? presets.iosArm64 : presets.iosX64
fromPreset(iosPreset, 'ios') {
compilations.main.outputKinds('FRAMEWORK')
binaries {
framework()
}
compilations.main {
cinterops {
sqlite3 {
@@ -61,7 +63,7 @@ kotlin {
kotlin { srcDir "src/main/common" }
dependencies {
implementation kotlin('stdlib-common')
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.2.0-alpha-2'
implementation "$KX_COROUTINES-core-common:$KX_COROUTINES_VERSION"
}
}
@@ -77,7 +79,7 @@ kotlin {
kotlin { srcDir "src/main/jvm" }
dependencies {
implementation kotlin('stdlib-jdk8')
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.0-alpha-2'
implementation "$KX_COROUTINES-core:$KX_COROUTINES_VERSION"
}
}
@@ -94,7 +96,7 @@ kotlin {
kotlin { srcDir "src/main/js" }
dependencies {
implementation kotlin('stdlib-js')
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.2.0-alpha-2'
implementation "$KX_COROUTINES-core-js:$KX_COROUTINES_VERSION"
}
}
@@ -108,36 +110,36 @@ kotlin {
iosMain {
kotlin { srcDir "src/main/ios" }
dependencies {
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.2.0-alpha-2'
implementation "$KX_COROUTINES-core-native:$KX_COROUTINES_VERSION"
}
}
iosTest {
kotlin { srcDir "src/test/ios" }
dependencies {
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.2.0-alpha-2'
implementation "$KX_COROUTINES-core-native:$KX_COROUTINES_VERSION"
}
}
}
task iosTestCopyResources(type: Copy) {
dependsOn 'linkTestIos'
from 'assets/test/'
from 'assets/main/'
into 'build/bin/ios/testDebugExecutable'
}
task iosTest {
dependsOn 'linkTestIos', 'iosTestCopyResources'
group = JavaBasePlugin.VERIFICATION_GROUP
description = "Runs tests on iOS simulator"
doLast {
def emulatorName = "iPhone 8 Plus"
def binary = kotlin.targets.ios.compilations.test.getBinary('EXECUTABLE', 'DEBUG')
exec {
commandLine 'xcrun', 'simctl', 'spawn', emulatorName, binary.absolutePath
}
}
}
// task iosTestCopyResources(type: Copy) {
// dependsOn 'linkTestIos'
// from 'assets/test/'
// from 'assets/main/'
// into 'build/bin/ios/testDebugExecutable'
// }
//
// task iosTestCustom {
// dependsOn 'linkTestIos', 'iosTestCopyResources'
// group = JavaBasePlugin.VERIFICATION_GROUP
// description = "Runs tests on iOS simulator"
//
// doLast {
// def emulatorName = "iPhone 8 Plus"
// def binary = kotlin.targets.ios.compilations.test.getBinary('EXECUTABLE', 'DEBUG')
// exec {
// commandLine 'xcrun', 'simctl', 'spawn', emulatorName, binary.absolutePath
// }
// }
// }
}