mirror of
https://github.com/InsanusMokrassar/MicroUtils.git
synced 2025-10-10 18:00:33 +00:00
Compare commits
13 Commits
Author | SHA1 | Date | |
---|---|---|---|
42c5bd3a7f | |||
d170e86c8a | |||
e3078169b1 | |||
a33ad123f6 | |||
7e14fa2f5c | |||
ba698b41e1 | |||
e76215987e | |||
d1a247af8c | |||
2b7e9534f3 | |||
38521558a1 | |||
100f3d214b | |||
1309867611 | |||
611f64f2e1 |
8
.space.kts
Normal file
8
.space.kts
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
job("Build and run tests") {
|
||||||
|
container(displayName = "Run gradle build", image = "openjdk:11") {
|
||||||
|
kotlinScript { api ->
|
||||||
|
// here can be your complex logic
|
||||||
|
api.gradlew("build")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
27
.travis.yml
27
.travis.yml
@@ -1,27 +0,0 @@
|
|||||||
language: android
|
|
||||||
install: true
|
|
||||||
|
|
||||||
os: linux
|
|
||||||
dist: trusty
|
|
||||||
jdk: oraclejdk8
|
|
||||||
|
|
||||||
android:
|
|
||||||
components:
|
|
||||||
- tools
|
|
||||||
- platform-tools
|
|
||||||
- build-tools-30.0.2
|
|
||||||
- android-30
|
|
||||||
- add-on
|
|
||||||
- extra
|
|
||||||
|
|
||||||
before_script:
|
|
||||||
- yes | /usr/local/android-sdk/tools/bin/sdkmanager "build-tools;30.0.2"
|
|
||||||
- yes | /usr/local/android-sdk/tools/bin/sdkmanager "platforms;android-30"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
include:
|
|
||||||
- stage: build
|
|
||||||
script: ./gradlew build -s -x jvmTest -x jsIrTest -x jsIrBrowserTest -x jsIrNodeTest -x jsLegacyTest -x jsLegacyBrowserTest -x jsLegacyNodeTest
|
|
||||||
# Tests are temporarily disabled on public travis due to the problems of launching
|
|
||||||
# - state: test
|
|
||||||
# script: ./gradlew allTests
|
|
26
CHANGELOG.md
26
CHANGELOG.md
@@ -1,6 +1,30 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## 0.5.14
|
## 0.5.17
|
||||||
|
|
||||||
|
**SINCE THIS UPDATE JS PARTS WILL BE COMPILED WITH IR COMPILER ONLY**
|
||||||
|
|
||||||
|
* `Versions`
|
||||||
|
* `Kotlin`: `1.5.20` -> `1.5.21`
|
||||||
|
* `Ktor`: `1.6.1` -> `1.6.2`
|
||||||
|
* `Klock`: `2.2.0` -> `2.3.1`
|
||||||
|
* `CryptoJS`: `4.0.0` -> `4.1.1`
|
||||||
|
|
||||||
|
## 0.5.16
|
||||||
|
|
||||||
|
* `Versions`
|
||||||
|
* `Coroutines`: `1.5.0` -> `1.5.1`
|
||||||
|
* `Serialization`: `1.2.1` -> `1.2.2`
|
||||||
|
* `Ktor`: `1.6.0` -> `1.6.1`
|
||||||
|
* `Klock`: `2.1.2` -> `2.2.0`
|
||||||
|
* `Core KTX`: `1.5.0` -> `1.6.0`
|
||||||
|
|
||||||
|
## 0.5.15 HOTFIX FOR 0.5.14
|
||||||
|
|
||||||
|
* `Coroutines`
|
||||||
|
* Fixes in `subscribeAsync`
|
||||||
|
|
||||||
|
## 0.5.14 NOT RECOMMENDED
|
||||||
|
|
||||||
* `Versions`
|
* `Versions`
|
||||||
* `Kotlin`: `1.5.10` -> `1.5.20`
|
* `Kotlin`: `1.5.10` -> `1.5.20`
|
||||||
|
@@ -1,6 +1,5 @@
|
|||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
|
||||||
google()
|
google()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
@@ -20,10 +19,8 @@ buildscript {
|
|||||||
allprojects {
|
allprojects {
|
||||||
repositories {
|
repositories {
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
jcenter()
|
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
google()
|
google()
|
||||||
maven { url "https://kotlin.bintray.com/kotlinx" }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// temporal crutch until legacy tests will be stabled or legacy target will be removed
|
// temporal crutch until legacy tests will be stabled or legacy target will be removed
|
||||||
|
@@ -38,7 +38,7 @@ private data class AsyncSubscriptionCommandData<T, M>(
|
|||||||
override suspend fun invoke(markersMap: MutableMap<M, SubscribeAsyncReceiver<T>>) {
|
override suspend fun invoke(markersMap: MutableMap<M, SubscribeAsyncReceiver<T>>) {
|
||||||
val marker = markerFactory(data)
|
val marker = markerFactory(data)
|
||||||
markersMap.getOrPut(marker) {
|
markersMap.getOrPut(marker) {
|
||||||
SubscribeAsyncReceiver(scope) {
|
SubscribeAsyncReceiver(scope.LinkedSupervisorScope()) {
|
||||||
safelyWithoutExceptions { block(it) }
|
safelyWithoutExceptions { block(it) }
|
||||||
if (isEmpty()) {
|
if (isEmpty()) {
|
||||||
onEmpty(marker)
|
onEmpty(marker)
|
||||||
@@ -80,7 +80,7 @@ fun <T, M> Flow<T>.subscribeAsync(
|
|||||||
actor.send(dataCommand)
|
actor.send(dataCommand)
|
||||||
}
|
}
|
||||||
|
|
||||||
job.invokeOnCompletion { subscope.cancel() }
|
job.invokeOnCompletion { if (subscope.isActive) subscope.cancel() }
|
||||||
|
|
||||||
return job
|
return job
|
||||||
}
|
}
|
||||||
|
@@ -7,14 +7,13 @@ plugins {
|
|||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
jcenter()
|
|
||||||
google()
|
google()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
jvm()
|
jvm()
|
||||||
js(BOTH) {
|
js(IR) {
|
||||||
browser()
|
browser()
|
||||||
nodejs()
|
nodejs()
|
||||||
}
|
}
|
||||||
|
@@ -7,14 +7,14 @@ android.useAndroidX=true
|
|||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
org.gradle.jvmargs=-Xmx2g
|
org.gradle.jvmargs=-Xmx2g
|
||||||
|
|
||||||
kotlin_version=1.5.20
|
kotlin_version=1.5.21
|
||||||
kotlin_coroutines_version=1.5.0
|
kotlin_coroutines_version=1.5.1
|
||||||
kotlin_serialisation_core_version=1.2.1
|
kotlin_serialisation_core_version=1.2.2
|
||||||
kotlin_exposed_version=0.32.1
|
kotlin_exposed_version=0.32.1
|
||||||
|
|
||||||
ktor_version=1.6.0
|
ktor_version=1.6.2
|
||||||
|
|
||||||
klockVersion=2.1.2
|
klockVersion=2.3.1
|
||||||
|
|
||||||
github_release_plugin_version=2.2.12
|
github_release_plugin_version=2.2.12
|
||||||
|
|
||||||
@@ -22,21 +22,21 @@ uuidVersion=0.3.0
|
|||||||
|
|
||||||
# ANDROID
|
# ANDROID
|
||||||
|
|
||||||
core_ktx_version=1.5.0
|
core_ktx_version=1.6.0
|
||||||
androidx_recycler_version=1.2.1
|
androidx_recycler_version=1.2.1
|
||||||
appcompat_version=1.3.0
|
appcompat_version=1.3.0
|
||||||
|
|
||||||
android_minSdkVersion=19
|
android_minSdkVersion=19
|
||||||
android_compileSdkVersion=30
|
android_compileSdkVersion=30
|
||||||
android_buildToolsVersion=30.0.3
|
android_buildToolsVersion=30.0.3
|
||||||
dexcount_version=2.0.0
|
dexcount_version=2.1.0-RC01
|
||||||
junit_version=4.12
|
junit_version=4.12
|
||||||
test_ext_junit_version=1.1.2
|
test_ext_junit_version=1.1.2
|
||||||
espresso_core=3.3.0
|
espresso_core=3.3.0
|
||||||
|
|
||||||
# JS NPM
|
# JS NPM
|
||||||
|
|
||||||
crypto_js_version=4.0.0
|
crypto_js_version=4.1.1
|
||||||
|
|
||||||
# Dokka
|
# Dokka
|
||||||
|
|
||||||
@@ -45,5 +45,5 @@ dokka_version=1.4.32
|
|||||||
# Project data
|
# Project data
|
||||||
|
|
||||||
group=dev.inmo
|
group=dev.inmo
|
||||||
version=0.5.14
|
version=0.5.17
|
||||||
android_code_version=55
|
android_code_version=58
|
||||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
@@ -4,9 +4,7 @@ project.group = "$group"
|
|||||||
apply from: "$publishGradlePath"
|
apply from: "$publishGradlePath"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
jvm {
|
jvm()
|
||||||
compilations.main.kotlinOptions.useIR = true
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
commonMain {
|
commonMain {
|
||||||
|
@@ -4,10 +4,8 @@ project.group = "$group"
|
|||||||
apply from: "$publishGradlePath"
|
apply from: "$publishGradlePath"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
jvm {
|
jvm()
|
||||||
compilations.main.kotlinOptions.useIR = true
|
js (IR) {
|
||||||
}
|
|
||||||
js (BOTH) {
|
|
||||||
browser()
|
browser()
|
||||||
nodejs()
|
nodejs()
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user