mirror of
				https://github.com/InsanusMokrassar/MicroUtils.git
				synced 2025-10-30 03:30:19 +00:00 
			
		
		
		
	Compare commits
	
		
			44 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| e20ab89688 | |||
| e557ba8184 | |||
| 8540e21d5a | |||
| 76c04a8506 | |||
| 128632770e | |||
| 31e0800e81 | |||
| 00ca96eec8 | |||
| 077ef2c639 | |||
| e3ea7be0e7 | |||
| 05fd1c2b14 | |||
| affcffe270 | |||
| 62930231e4 | |||
| ad651631ec | |||
| cf1c8f13db | |||
| 9acc69b897 | |||
| 9bc7cbdb50 | |||
| 2ed8443e28 | |||
| 94f598c2b4 | |||
| d83d30af06 | |||
| 284e763f0d | |||
| 3bfa172533 | |||
| b5b1fd6d5f | |||
| 05e0d9b7d2 | |||
| 1ae1f8dee2 | |||
| 1bf479a0b7 | |||
| 9d04d49628 | |||
| 3de324519b | |||
| 4be90d0ea5 | |||
| 041f35ed6c | |||
| 9c463d0338 | |||
| 5ec0a46089 | |||
| 979d0ee4ca | |||
| 448686b399 | |||
|  | 0ff149a3d3 | ||
| 50a90d6e96 | |||
| 5f93706d91 | |||
| 39415550f5 | |||
|  | 4586ad65b5 | ||
| 8c5678e26f | |||
| 5dff373d5f | |||
| e17868a085 | |||
| 97bb6d0936 | |||
|  | 54576d8dec | ||
| 282bb24c71 | 
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -9,6 +9,7 @@ settings.xml | |||||||
| .gradle/ | .gradle/ | ||||||
| build/ | build/ | ||||||
| out/ | out/ | ||||||
|  | bin/ | ||||||
|  |  | ||||||
| secret.gradle | secret.gradle | ||||||
| local.properties | local.properties | ||||||
|   | |||||||
							
								
								
									
										33
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										33
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,38 @@ | |||||||
| # Changelog | # Changelog | ||||||
|  |  | ||||||
|  | ## 0.25.8 | ||||||
|  |  | ||||||
|  | * `Pagination`: | ||||||
|  |   * `Compose`: | ||||||
|  |     * New function `rememberInfinityPagedComponentContext` to create `InfinityPagedComponentContext` | ||||||
|  |     * New variants of `InfinityPagedComponent` component | ||||||
|  |  | ||||||
|  | ## 0.25.7 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |   * `Compose`: `1.8.0` -> `1.8.1` | ||||||
|  |   * `Xerial SQLite`: `3.49.1.0` -> `3.50.1.0` | ||||||
|  |   * `Okio`: `3.11.0` -> `3.12.0` | ||||||
|  |   * `Android AppCompat`: `1.7.0` -> `1.7.1` | ||||||
|  |   * `Android Fragment`: `1.8.6` -> `1.8.8` | ||||||
|  |  | ||||||
|  | ## 0.25.6 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |   * `Kotlin`: `2.1.20` -> `2.1.21` | ||||||
|  |   * `KSLog`: `1.4.1` -> `1.4.2` | ||||||
|  |   * `Compose`: `1.7.3` -> `1.8.0` | ||||||
|  |   * `Okio`: `3.10.2` -> `3.11.0` | ||||||
|  |  | ||||||
|  | ## 0.25.5 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |   * `Exposed`: `0.60.0` -> `0.61.0` | ||||||
|  |   * `Serialization`: `1.8.0` -> `1.8.1` | ||||||
|  |   * `Coroutines`: `1.10.1` -> `1.10.2` | ||||||
|  | * `Common`: | ||||||
|  |   * Small performance optimization of `MutableMap.applyDiff` | ||||||
|  |  | ||||||
| ## 0.25.4 | ## 0.25.4 | ||||||
|  |  | ||||||
| * `Versions`: | * `Versions`: | ||||||
|   | |||||||
							
								
								
									
										48
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										48
									
								
								README.md
									
									
									
									
									
								
							| @@ -35,3 +35,51 @@ Most of complex modules are built with next hierarchy: | |||||||
|     * `common` part contains routes which are common for clients and servers |     * `common` part contains routes which are common for clients and servers | ||||||
|     * `client` submodule contains clients which are usually using `UnifiedRequester` to make requests using routes from `ktor/common` module and some internal logic of requests |     * `client` submodule contains clients which are usually using `UnifiedRequester` to make requests using routes from `ktor/common` module and some internal logic of requests | ||||||
|     * `server` submodule (in most cases `JVM`-only) contains some extensions for `Route` instances which usually will give opportunity to proxy internet requests from `ktor/client` realization to some proxy object |     * `server` submodule (in most cases `JVM`-only) contains some extensions for `Route` instances which usually will give opportunity to proxy internet requests from `ktor/client` realization to some proxy object | ||||||
|  |  | ||||||
|  | ## Gradle Templates | ||||||
|  |  | ||||||
|  | All templates can be used by applying them in your project's build.gradle files using the `apply from` directive. For example: | ||||||
|  |  | ||||||
|  | ```gradle | ||||||
|  | apply from: "$defaultProject" | ||||||
|  | ``` | ||||||
|  |  | ||||||
|  | In the sample has been used `defaultProject.gradle` as a basic template. | ||||||
|  |  | ||||||
|  | The project includes a collection of Gradle templates to simplify project setup and configuration. These templates are located in the `gradle/templates` directory and can be used to quickly set up different types of projects: | ||||||
|  |  | ||||||
|  | ### Project Setup Templates | ||||||
|  |  | ||||||
|  | * `defaultProject.gradle` (usage `apply from: "$defaultProject"`) - Basic project configuration | ||||||
|  | * `defaultProjectWithSerialization.gradle` (usage `apply from: "$defaultProjectWithSerialization"`) - Project configuration with Kotlin Serialization support | ||||||
|  | * `mppJavaProject.gradle` (usage `apply from: "$mppJavaProject"`) - Multiplatform project with Java support | ||||||
|  | * `mppAndroidProject.gradle` (usage `apply from: "$mppAndroidProject"`) - Multiplatform project with Android support | ||||||
|  |  | ||||||
|  | ### Multiplatform Configuration Templates | ||||||
|  |  | ||||||
|  | * `enableMPPAndroid.gradle` (usage `apply from: "$enableMPPAndroid"`) - Enable Android target in multiplatform project | ||||||
|  | * `enableMPPJs.gradle` (usage `apply from: "$enableMPPJs"`) - Enable JavaScript target in multiplatform project | ||||||
|  | * `enableMPPJvm.gradle` (usage `apply from: "$enableMPPJvm"`) - Enable JVM target in multiplatform project | ||||||
|  | * `enableMPPNativeArm64.gradle` (usage `apply from: "$enableMPPNativeArm64"`) - Enable ARM64 native target | ||||||
|  | * `enableMPPNativeX64.gradle` (usage `apply from: "$enableMPPNativeX64"`) - Enable x64 native target | ||||||
|  | * `enableMPPWasmJs.gradle` (usage `apply from: "$enableMPPWasmJs"`) - Enable WebAssembly JavaScript target | ||||||
|  |  | ||||||
|  | ### Compose Integration Templates | ||||||
|  |  | ||||||
|  | * `addCompose.gradle` (usage `apply from: "$addCompose"`) - Basic Compose configuration | ||||||
|  | * `addComposeForAndroid.gradle` (usage `apply from: "$addComposeForAndroid"`) - Compose configuration for Android | ||||||
|  | * `addComposeForDesktop.gradle` (usage `apply from: "$addComposeForDesktop"`) - Compose configuration for Desktop | ||||||
|  | * `addComposeForJs.gradle` (usage `apply from: "$addComposeForJs"`) - Compose configuration for JavaScript | ||||||
|  |  | ||||||
|  | ### Publishing Templates | ||||||
|  |  | ||||||
|  | * `publish.gradle` (usage `apply from: "$publish"`) - General publishing configuration | ||||||
|  | * `publish_jvm.gradle` (usage `apply from: "$publish_jvm"`) - JVM-specific publishing configuration | ||||||
|  | * `publish.kpsb` and `publish_jvm.kpsb` (usage `apply from: "$publish_kpsb"` and `apply from: "$publish_jvm_kpsb"`) - Publishing configuration for Kotlin Multiplatform and JVM | ||||||
|  |  | ||||||
|  | ### Combined Project Templates | ||||||
|  |  | ||||||
|  | * `mppJvmJsWasmJsLinuxMingwProject.gradle` (usage `apply from: "$mppJvmJsWasmJsLinuxMingwProject"`) - Multiplatform project for JVM, JS, Wasm, Linux, and MinGW | ||||||
|  | * `mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project.gradle` (usage `apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"`) - Multiplatform project with additional Android and ARM64 support | ||||||
|  | * `mppComposeJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project.gradle` (usage `apply from: "$mppComposeJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"`) - Multiplatform project with Compose support | ||||||
|  | * `mppProjectWithSerializationAndCompose.gradle` (usage `apply from: "$mppProjectWithSerializationAndCompose"`) - Multiplatform project with both Serialization and Compose support | ||||||
|   | |||||||
							
								
								
									
										17
									
								
								build.gradle
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								build.gradle
									
									
									
									
									
								
							| @@ -19,15 +19,30 @@ buildscript { | |||||||
|  |  | ||||||
| plugins { | plugins { | ||||||
|     alias(libs.plugins.versions) |     alias(libs.plugins.versions) | ||||||
|  |     alias(libs.plugins.nmcp.aggregation) | ||||||
|  | } | ||||||
|  |  | ||||||
|  |  | ||||||
|  | if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) { | ||||||
|  |     nmcpAggregation { | ||||||
|  |         centralPortal { | ||||||
|  |             username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER') | ||||||
|  |             password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD') | ||||||
|  |             verificationTimeout = Duration.ofHours(4) | ||||||
|  |             publishingType = "USER_MANAGED" | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         publishAllProjectsProbablyBreakingProjectIsolation() | ||||||
|  |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| allprojects { | allprojects { | ||||||
|     repositories { |     repositories { | ||||||
|         mavenLocal() |  | ||||||
|         mavenCentral() |         mavenCentral() | ||||||
|         google() |         google() | ||||||
|         maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } |         maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } | ||||||
|         maven { url "https://nexus.inmo.dev/repository/maven-releases/" } |         maven { url "https://nexus.inmo.dev/repository/maven-releases/" } | ||||||
|  |         mavenLocal() | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -4,4 +4,4 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
| @@ -29,5 +29,12 @@ kotlin { | |||||||
|                 api libs.okio |                 api libs.okio | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  |         wasmJsMain { | ||||||
|  |             dependencies { | ||||||
|  |                 api libs.kotlinx.browser | ||||||
|  |                 api libs.kt.coroutines | ||||||
|  |             } | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ plugins { | |||||||
|     alias(libs.plugins.kt.jb.compose) |     alias(libs.plugins.kt.jb.compose) | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppComposeJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -82,13 +82,11 @@ fun <K, V> MutableMap<K, V>.applyDiff( | |||||||
|     mapDiff: MapDiff<K, V> |     mapDiff: MapDiff<K, V> | ||||||
| ) { | ) { | ||||||
|     mapDiff.apply { |     mapDiff.apply { | ||||||
|         removed.keys.forEach { remove(it) } |         keys.removeAll(removed.keys) | ||||||
|         changed.forEach { (k, oldNew) -> |         changed.forEach { (k, oldNew) -> | ||||||
|             put(k, oldNew.second) |             put(k, oldNew.second) | ||||||
|         } |         } | ||||||
|         added.forEach { (k, new) -> |         putAll(added) | ||||||
|             put(k, new) |  | ||||||
|         } |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -0,0 +1,15 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import org.khronos.webgl.* | ||||||
|  |  | ||||||
|  | fun DataView.toByteArray() = ByteArray(this.byteLength) { | ||||||
|  |     getInt8(it) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun ArrayBuffer.toByteArray() = Int8Array(this).toByteArray() | ||||||
|  |  | ||||||
|  | fun ByteArray.toDataView() = DataView(ArrayBuffer(size)).also { | ||||||
|  |     forEachIndexed { i, byte -> it.setInt8(i, byte) } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun ByteArray.toArrayBuffer() = toDataView().buffer | ||||||
| @@ -0,0 +1,13 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.browser.window | ||||||
|  |  | ||||||
|  | fun copyToClipboard(text: String): Boolean { | ||||||
|  |     return runCatching { | ||||||
|  |         window.navigator.clipboard.writeText( | ||||||
|  |             text | ||||||
|  |         ) | ||||||
|  |     }.onFailure { | ||||||
|  |         it.printStackTrace() | ||||||
|  |     }.isSuccess | ||||||
|  | } | ||||||
| @@ -0,0 +1,31 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.browser.window | ||||||
|  | import kotlinx.coroutines.await | ||||||
|  | import org.w3c.fetch.Response | ||||||
|  | import org.w3c.files.Blob | ||||||
|  | import org.w3c.files.BlobPropertyBag | ||||||
|  |  | ||||||
|  | external class ClipboardItem(data: JsAny?) : JsAny | ||||||
|  |  | ||||||
|  | fun createBlobData(blob: Blob): JsAny = js("""({[blob.type]: blob})""") | ||||||
|  |  | ||||||
|  | inline fun Blob.convertToClipboardItem(): ClipboardItem { | ||||||
|  |     return ClipboardItem(createBlobData(this)) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | suspend fun copyImageURLToClipboard(imageUrl: String): Boolean { | ||||||
|  |     return runCatching { | ||||||
|  |         val response = window.fetch(imageUrl).await<Response>() | ||||||
|  |         val blob = response.blob().await<Blob>() | ||||||
|  |         val data = arrayOf( | ||||||
|  |             Blob( | ||||||
|  |                 arrayOf(blob).toJsArray().unsafeCast(), | ||||||
|  |                 BlobPropertyBag("image/png") | ||||||
|  |             ).convertToClipboardItem() | ||||||
|  |         ).toJsArray() | ||||||
|  |         window.navigator.clipboard.write(data.unsafeCast()) | ||||||
|  |     }.onFailure { | ||||||
|  |         it.printStackTrace() | ||||||
|  |     }.isSuccess | ||||||
|  | } | ||||||
| @@ -0,0 +1,63 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.browser.document | ||||||
|  | import org.w3c.dom.* | ||||||
|  |  | ||||||
|  | private fun createMutationObserverInit(childList: Boolean, subtree: Boolean): JsAny = js("({childList, subtree})") | ||||||
|  |  | ||||||
|  | fun Node.onRemoved(block: () -> Unit): MutationObserver { | ||||||
|  |     lateinit var observer: MutationObserver | ||||||
|  |  | ||||||
|  |     observer = MutationObserver { _, _ -> | ||||||
|  |         fun checkIfRemoved(node: Node): Boolean { | ||||||
|  |             return node.parentNode != document && (node.parentNode ?.let { checkIfRemoved(it) } ?: true) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         if (checkIfRemoved(this)) { | ||||||
|  |             observer.disconnect() | ||||||
|  |             block() | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     observer.observe(document, createMutationObserverInit(childList = true, subtree = true).unsafeCast()) | ||||||
|  |     return observer | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun Element.onVisibilityChanged(block: IntersectionObserverEntry.(Float, IntersectionObserver) -> Unit): IntersectionObserver { | ||||||
|  |     var previousIntersectionRatio = -1f | ||||||
|  |     val observer = IntersectionObserver { entries, observer -> | ||||||
|  |         entries.toArray().forEach { | ||||||
|  |             if (previousIntersectionRatio.toDouble() != it.intersectionRatio.toDouble()) { | ||||||
|  |                 previousIntersectionRatio = it.intersectionRatio.toDouble().toFloat() | ||||||
|  |                 it.block(previousIntersectionRatio, observer) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     observer.observe(this) | ||||||
|  |     return observer | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun Element.onVisible(block: Element.(IntersectionObserver) -> Unit) { | ||||||
|  |     var previous = -1f | ||||||
|  |     onVisibilityChanged { intersectionRatio, observer -> | ||||||
|  |         if (previous != intersectionRatio) { | ||||||
|  |             if (intersectionRatio > 0 && previous == 0f) { | ||||||
|  |                 block(observer) | ||||||
|  |             } | ||||||
|  |             previous = intersectionRatio | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun Element.onInvisible(block: Element.(IntersectionObserver) -> Unit): IntersectionObserver { | ||||||
|  |     var previous = -1f | ||||||
|  |     return onVisibilityChanged { intersectionRatio, observer -> | ||||||
|  |         if (previous != intersectionRatio) { | ||||||
|  |             if (intersectionRatio == 0f && previous != 0f) { | ||||||
|  |                 block(observer) | ||||||
|  |             } | ||||||
|  |             previous = intersectionRatio | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,43 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.browser.window | ||||||
|  | import org.w3c.dom.DOMRect | ||||||
|  | import org.w3c.dom.Element | ||||||
|  |  | ||||||
|  | val DOMRect.isOnScreenByLeftEdge: Boolean | ||||||
|  |     get() = left >= 0 && left <= window.innerWidth | ||||||
|  | inline val Element.isOnScreenByLeftEdge | ||||||
|  |     get() = getBoundingClientRect().isOnScreenByLeftEdge | ||||||
|  |  | ||||||
|  | val DOMRect.isOnScreenByRightEdge: Boolean | ||||||
|  |     get() = right >= 0 && right <= window.innerWidth | ||||||
|  | inline val Element.isOnScreenByRightEdge | ||||||
|  |     get() = getBoundingClientRect().isOnScreenByRightEdge | ||||||
|  |  | ||||||
|  | internal val DOMRect.isOnScreenHorizontally: Boolean | ||||||
|  |     get() = isOnScreenByLeftEdge || isOnScreenByRightEdge | ||||||
|  |  | ||||||
|  |  | ||||||
|  | val DOMRect.isOnScreenByTopEdge: Boolean | ||||||
|  |     get() = top >= 0 && top <= window.innerHeight | ||||||
|  | inline val Element.isOnScreenByTopEdge | ||||||
|  |     get() = getBoundingClientRect().isOnScreenByTopEdge | ||||||
|  |  | ||||||
|  | val DOMRect.isOnScreenByBottomEdge: Boolean | ||||||
|  |     get() = bottom >= 0 && bottom <= window.innerHeight | ||||||
|  | inline val Element.isOnScreenByBottomEdge | ||||||
|  |     get() = getBoundingClientRect().isOnScreenByBottomEdge | ||||||
|  |  | ||||||
|  | internal val DOMRect.isOnScreenVertically: Boolean | ||||||
|  |     get() = isOnScreenByLeftEdge || isOnScreenByRightEdge | ||||||
|  |  | ||||||
|  |  | ||||||
|  | val DOMRect.isOnScreenFully: Boolean | ||||||
|  |     get() = isOnScreenByLeftEdge && isOnScreenByTopEdge && isOnScreenByRightEdge && isOnScreenByBottomEdge | ||||||
|  | val Element.isOnScreenFully: Boolean | ||||||
|  |     get() = getBoundingClientRect().isOnScreenFully | ||||||
|  |  | ||||||
|  | val DOMRect.isOnScreen: Boolean | ||||||
|  |     get() = isOnScreenFully || (isOnScreenHorizontally && isOnScreenVertically) | ||||||
|  | inline val Element.isOnScreen: Boolean | ||||||
|  |     get() = getBoundingClientRect().isOnScreen | ||||||
| @@ -0,0 +1,127 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import org.w3c.dom.DOMRectReadOnly | ||||||
|  | import org.w3c.dom.Element | ||||||
|  |  | ||||||
|  | external interface IntersectionObserverOptions: JsAny { | ||||||
|  |     /** | ||||||
|  |      * An Element or Document object which is an ancestor of the intended target, whose bounding rectangle will be | ||||||
|  |      * considered the viewport. Any part of the target not visible in the visible area of the root is not considered | ||||||
|  |      * visible. | ||||||
|  |      */ | ||||||
|  |     var root: Element? | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * A string which specifies a set of offsets to add to the root's bounding_box when calculating intersections, | ||||||
|  |      * effectively shrinking or growing the root for calculation purposes. The syntax is approximately the same as that | ||||||
|  |      * for the CSS margin property; see The root element and root margin in Intersection Observer API for more | ||||||
|  |      * information on how the margin works and the syntax. The default is "0px 0px 0px 0px". | ||||||
|  |      */ | ||||||
|  |     var rootMargin: String? | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Either a single number or an array of numbers between 0.0 and 1.0, specifying a ratio of intersection area to | ||||||
|  |      * total bounding box area for the observed target. A value of 0.0 means that even a single visible pixel counts as | ||||||
|  |      * the target being visible. 1.0 means that the entire target element is visible. See Thresholds in Intersection | ||||||
|  |      * Observer API for a more in-depth description of how thresholds are used. The default is a threshold of 0.0. | ||||||
|  |      */ | ||||||
|  |     var threshold: JsArray<JsNumber>? | ||||||
|  | } | ||||||
|  |  | ||||||
|  | private fun createEmptyJsObject(): JsAny = js("{}") | ||||||
|  |  | ||||||
|  | fun IntersectionObserverOptions( | ||||||
|  |     block: IntersectionObserverOptions.() -> Unit = {} | ||||||
|  | ): IntersectionObserverOptions = createEmptyJsObject().unsafeCast<IntersectionObserverOptions>().apply(block) | ||||||
|  |  | ||||||
|  | external interface IntersectionObserverEntry: JsAny { | ||||||
|  |     /** | ||||||
|  |      * Returns the bounds rectangle of the target element as a DOMRectReadOnly. The bounds are computed as described in | ||||||
|  |      * the documentation for Element.getBoundingClientRect(). | ||||||
|  |      */ | ||||||
|  |     val boundingClientRect: DOMRectReadOnly | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Returns the ratio of the intersectionRect to the boundingClientRect. | ||||||
|  |      */ | ||||||
|  |     val intersectionRatio: JsNumber | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Returns a DOMRectReadOnly representing the target's visible area. | ||||||
|  |      */ | ||||||
|  |     val intersectionRect: DOMRectReadOnly | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * A Boolean value which is true if the target element intersects with the intersection observer's root. If this is | ||||||
|  |      * true, then, the IntersectionObserverEntry describes a transition into a state of intersection; if it's false, | ||||||
|  |      * then you know the transition is from intersecting to not-intersecting. | ||||||
|  |      */ | ||||||
|  |     val isIntersecting: Boolean | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Returns a DOMRectReadOnly for the intersection observer's root. | ||||||
|  |      */ | ||||||
|  |     val rootBounds: DOMRectReadOnly | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * The Element whose intersection with the root changed. | ||||||
|  |      */ | ||||||
|  |     val target: Element | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * A DOMHighResTimeStamp indicating the time at which the intersection was recorded, relative to the | ||||||
|  |      * IntersectionObserver's time origin. | ||||||
|  |      */ | ||||||
|  |     val time: Double | ||||||
|  | } | ||||||
|  |  | ||||||
|  | typealias IntersectionObserverCallback = (entries: JsArray<IntersectionObserverEntry>, observer: IntersectionObserver) -> Unit | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * This is just an implementation from [this commentary](https://youtrack.jetbrains.com/issue/KT-43157#focus=Comments-27-4498582.0-0) | ||||||
|  |  * of Kotlin JS issue related to the absence of [Intersection Observer API](https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserver) | ||||||
|  |  */ | ||||||
|  | external class IntersectionObserver(callback: IntersectionObserverCallback): JsAny { | ||||||
|  |     constructor(callback: IntersectionObserverCallback, options: IntersectionObserverOptions) | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * The Element or Document whose bounds are used as the bounding box when testing for intersection. If no root value | ||||||
|  |      * was passed to the constructor or its value is null, the top-level document's viewport is used. | ||||||
|  |      */ | ||||||
|  |     val root: Element | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * An offset rectangle applied to the root's bounding box when calculating intersections, effectively shrinking or | ||||||
|  |      * growing the root for calculation purposes. The value returned by this property may not be the same as the one | ||||||
|  |      * specified when calling the constructor as it may be changed to match internal requirements. Each offset can be | ||||||
|  |      * expressed in pixels (px) or as a percentage (%). The default is "0px 0px 0px 0px". | ||||||
|  |      */ | ||||||
|  |     val rootMargin: String | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * A list of thresholds, sorted in increasing numeric order, where each threshold is a ratio of intersection area to | ||||||
|  |      * bounding box area of an observed target. Notifications for a target are generated when any of the thresholds are | ||||||
|  |      * crossed for that target. If no value was passed to the constructor, 0 is used. | ||||||
|  |      */ | ||||||
|  |     val thresholds: JsArray<JsNumber> | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Stops the IntersectionObserver object from observing any target. | ||||||
|  |      */ | ||||||
|  |     fun disconnect() | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Tells the IntersectionObserver a target element to observe. | ||||||
|  |      */ | ||||||
|  |     fun observe(targetElement: Element) | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Returns an array of IntersectionObserverEntry objects for all observed targets. | ||||||
|  |      */ | ||||||
|  |     fun takeRecords(): JsArray<IntersectionObserverEntry> | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Tells the IntersectionObserver to stop observing a particular target element. | ||||||
|  |      */ | ||||||
|  |     fun unobserve(targetElement: Element) | ||||||
|  | } | ||||||
| @@ -0,0 +1,12 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import org.w3c.dom.Element | ||||||
|  |  | ||||||
|  | inline val Element.isOverflowWidth | ||||||
|  |     get() = scrollWidth > clientWidth | ||||||
|  |  | ||||||
|  | inline val Element.isOverflowHeight | ||||||
|  |     get() = scrollHeight > clientHeight | ||||||
|  |  | ||||||
|  | inline val Element.isOverflow | ||||||
|  |     get() = isOverflowHeight || isOverflowWidth | ||||||
| @@ -0,0 +1,58 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.coroutines.await | ||||||
|  | import org.khronos.webgl.ArrayBuffer | ||||||
|  | import org.w3c.dom.ErrorEvent | ||||||
|  | import org.w3c.files.* | ||||||
|  | import kotlin.js.Promise | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual typealias MPPFile = File | ||||||
|  |  | ||||||
|  | private fun createJsError(message: String): JsAny = js("Error(message)") | ||||||
|  |  | ||||||
|  | fun MPPFile.readBytesPromise() = Promise { success, failure -> | ||||||
|  |     val reader = FileReader() | ||||||
|  |     reader.onload = { | ||||||
|  |         success((reader.result as ArrayBuffer)) | ||||||
|  |     } | ||||||
|  |     reader.onerror = { | ||||||
|  |         val message = (it as ErrorEvent).message | ||||||
|  |         failure(createJsError(message)) | ||||||
|  |     } | ||||||
|  |     reader.readAsArrayBuffer(this) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun MPPFile.readBytes(): ByteArray { | ||||||
|  |     val reader = FileReaderSync() | ||||||
|  |     return reader.readAsArrayBuffer(this).toByteArray() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | private suspend fun MPPFile.dirtyReadBytes(): ByteArray = readBytesPromise().await<ArrayBuffer>().toByteArray() | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual val MPPFile.filename: FileName | ||||||
|  |     get() = FileName(name) | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual val MPPFile.filesize: Long | ||||||
|  |     get() = jsNumberToBigInt(size).toLong() | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | @Warning("That is not optimized version of bytes allocator. Use asyncBytesAllocator everywhere you can") | ||||||
|  | actual val MPPFile.bytesAllocatorSync: ByteArrayAllocator | ||||||
|  |     get() = ::readBytes | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | @Warning("That is not optimized version of bytes allocator. Use asyncBytesAllocator everywhere you can") | ||||||
|  | actual val MPPFile.bytesAllocator: SuspendByteArrayAllocator | ||||||
|  |     get() = ::dirtyReadBytes | ||||||
|  |  | ||||||
|  | private fun jsNumberToBigInt(number: JsNumber): JsBigInt = js("BigInt(number)") | ||||||
| @@ -0,0 +1,41 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.browser.document | ||||||
|  | import org.w3c.dom.* | ||||||
|  | import org.w3c.dom.events.Event | ||||||
|  | import org.w3c.dom.events.EventListener | ||||||
|  |  | ||||||
|  | private fun createEventListener(listener: (Event) -> Unit): JsAny = js("({handleEvent: listener})") | ||||||
|  |  | ||||||
|  | fun Element.onActionOutside(type: String, options: AddEventListenerOptions? = null, callback: (Event) -> Unit): EventListener { | ||||||
|  |     lateinit var observer: MutationObserver | ||||||
|  |     val listener = createEventListener { it: Event -> | ||||||
|  |         val elementsToCheck = mutableListOf(this@onActionOutside) | ||||||
|  |         while (it.target != this@onActionOutside && elementsToCheck.isNotEmpty()) { | ||||||
|  |             val childrenGettingElement = elementsToCheck.removeFirst() | ||||||
|  |             for (i in 0 until childrenGettingElement.childElementCount) { | ||||||
|  |                 elementsToCheck.add(childrenGettingElement.children[i] ?: continue) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         if (elementsToCheck.isEmpty()) { | ||||||
|  |             callback(it) | ||||||
|  |         } | ||||||
|  |     }.unsafeCast<EventListener>() | ||||||
|  |  | ||||||
|  |     if (options == null) { | ||||||
|  |         document.addEventListener(type, listener) | ||||||
|  |     } else { | ||||||
|  |         document.addEventListener(type, listener, options) | ||||||
|  |     } | ||||||
|  |     observer = onRemoved { | ||||||
|  |         if (options == null) { | ||||||
|  |             document.removeEventListener(type, listener) | ||||||
|  |         } else { | ||||||
|  |             document.removeEventListener(type, listener, options) | ||||||
|  |         } | ||||||
|  |         observer.disconnect() | ||||||
|  |     } | ||||||
|  |     return listener | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun Element.onClickOutside(options: AddEventListenerOptions? = null, callback: (Event) -> Unit) = onActionOutside("click", options, callback) | ||||||
| @@ -0,0 +1,8 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.browser.window | ||||||
|  |  | ||||||
|  | fun openLink(link: String, target: String = "_blank", features: String = "") { | ||||||
|  |     window.open(link, target, features) ?.focus() | ||||||
|  | } | ||||||
|  |  | ||||||
| @@ -0,0 +1,56 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import org.w3c.dom.* | ||||||
|  |  | ||||||
|  | external class ResizeObserver( | ||||||
|  |     callback: (JsArray<ResizeObserverEntry>, ResizeObserver) -> Unit | ||||||
|  | ): JsAny { | ||||||
|  |     fun observe(target: Element, options: JsAny = definedExternally) | ||||||
|  |  | ||||||
|  |     fun unobserve(target: Element) | ||||||
|  |  | ||||||
|  |     fun disconnect() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | private fun createObserveOptions(jsBox: JsString?): JsAny = js("({box: jsBox})") | ||||||
|  |  | ||||||
|  | external interface ResizeObserverSize: JsAny { | ||||||
|  |     val blockSize: Float | ||||||
|  |     val inlineSize: Float | ||||||
|  | } | ||||||
|  |  | ||||||
|  | external interface ResizeObserverEntry: JsAny { | ||||||
|  |     val borderBoxSize: JsArray<ResizeObserverSize> | ||||||
|  |     val contentBoxSize: JsArray<ResizeObserverSize> | ||||||
|  |     val devicePixelContentBoxSize: JsArray<ResizeObserverSize> | ||||||
|  |     val contentRect: DOMRectReadOnly | ||||||
|  |     val target: Element | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun ResizeObserver.observe(target: Element, options: ResizeObserverObserveOptions) = observe( | ||||||
|  |     target, | ||||||
|  |     createObserveOptions(options.box?.name?.toJsString()) | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | class ResizeObserverObserveOptions( | ||||||
|  |     val box: Box? = null | ||||||
|  | ) { | ||||||
|  |     sealed interface Box { | ||||||
|  |         val name: String | ||||||
|  |  | ||||||
|  |         object Content : Box { | ||||||
|  |             override val name: String | ||||||
|  |                 get() = "content-box" | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         object Border : Box { | ||||||
|  |             override val name: String | ||||||
|  |                 get() = "border-box" | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         object DevicePixelContent : Box { | ||||||
|  |             override val name: String | ||||||
|  |                 get() = "device-pixel-content-box" | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,30 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.browser.document | ||||||
|  | import kotlinx.dom.createElement | ||||||
|  | import org.w3c.dom.HTMLElement | ||||||
|  | import org.w3c.dom.HTMLInputElement | ||||||
|  | import org.w3c.files.get | ||||||
|  |  | ||||||
|  | fun selectFile( | ||||||
|  |     inputSetup: (HTMLInputElement) -> Unit = {}, | ||||||
|  |     onFailure: (Throwable) -> Unit = {}, | ||||||
|  |     onFile: (MPPFile) -> Unit | ||||||
|  | ) { | ||||||
|  |     (document.createElement("input") { | ||||||
|  |         (this as HTMLInputElement).apply { | ||||||
|  |             type = "file" | ||||||
|  |             onchange = { | ||||||
|  |                 runCatching { | ||||||
|  |                     files ?.get(0) ?: error("File must not be null") | ||||||
|  |                 }.onSuccess { | ||||||
|  |                     onFile(it) | ||||||
|  |                 }.onFailure { | ||||||
|  |                     onFailure(it) | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             inputSetup(this) | ||||||
|  |         } | ||||||
|  |     } as HTMLElement).click() | ||||||
|  | } | ||||||
|  |  | ||||||
| @@ -0,0 +1,14 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.browser.document | ||||||
|  | import org.w3c.dom.HTMLAnchorElement | ||||||
|  |  | ||||||
|  | fun triggerDownloadFile(filename: String, fileLink: String) { | ||||||
|  |     val hiddenElement = document.createElement("a") as HTMLAnchorElement | ||||||
|  |  | ||||||
|  |     hiddenElement.href = fileLink | ||||||
|  |     hiddenElement.target = "_blank" | ||||||
|  |     hiddenElement.download = filename | ||||||
|  |     hiddenElement.click() | ||||||
|  | } | ||||||
|  |  | ||||||
| @@ -0,0 +1,48 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.browser.window | ||||||
|  | import org.w3c.dom.Element | ||||||
|  | import org.w3c.dom.css.CSSStyleDeclaration | ||||||
|  |  | ||||||
|  | sealed class Visibility | ||||||
|  | data object Visible : Visibility() | ||||||
|  | data object Invisible : Visibility() | ||||||
|  | data object Gone : Visibility() | ||||||
|  |  | ||||||
|  | var CSSStyleDeclaration.visibilityState: Visibility | ||||||
|  |     get() = when { | ||||||
|  |         display == "none" -> Gone | ||||||
|  |         visibility == "hidden" -> Invisible | ||||||
|  |         else -> Visible | ||||||
|  |     } | ||||||
|  |     set(value) { | ||||||
|  |         when (value) { | ||||||
|  |             Visible -> { | ||||||
|  |                 if (display == "none") { | ||||||
|  |                     display = "initial" | ||||||
|  |                 } | ||||||
|  |                 visibility = "visible" | ||||||
|  |             } | ||||||
|  |             Invisible -> { | ||||||
|  |                 if (display == "none") { | ||||||
|  |                     display = "initial" | ||||||
|  |                 } | ||||||
|  |                 visibility = "hidden" | ||||||
|  |             } | ||||||
|  |             Gone -> { | ||||||
|  |                 display = "none" | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | inline var Element.visibilityState: Visibility | ||||||
|  |     get() = window.getComputedStyle(this).visibilityState | ||||||
|  |     set(value) { | ||||||
|  |         window.getComputedStyle(this).visibilityState = value | ||||||
|  |     } | ||||||
|  |  | ||||||
|  | inline val Element.isVisible: Boolean | ||||||
|  |     get() = visibilityState == Visible | ||||||
|  | inline val Element.isInvisible: Boolean | ||||||
|  |     get() = visibilityState == Invisible | ||||||
|  | inline val Element.isGone: Boolean | ||||||
|  |     get() = visibilityState == Gone | ||||||
| @@ -0,0 +1,11 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | actual fun Float.fixed(signs: Int): Float { | ||||||
|  |     return jsToFixed(toDouble().toJsNumber(), signs.coerceIn(FixedSignsRange)).toString().toFloat() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | actual fun Double.fixed(signs: Int): Double { | ||||||
|  |     return jsToFixed(toJsNumber(), signs.coerceIn(FixedSignsRange)).toString().toDouble() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | private fun jsToFixed(number: JsNumber, signs: Int): JsString = js("number.toFixed(signs)") | ||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ plugins { | |||||||
|     alias(libs.plugins.kt.jb.compose) |     alias(libs.plugins.kt.jb.compose) | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppComposeJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -4,6 +4,15 @@ import kotlinx.coroutines.* | |||||||
| import kotlinx.coroutines.channels.Channel | import kotlinx.coroutines.channels.Channel | ||||||
| import kotlinx.coroutines.flow.consumeAsFlow | import kotlinx.coroutines.flow.consumeAsFlow | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Creates an actor using coroutines that processes incoming messages of type [T]. | ||||||
|  |  * An actor is a computational entity that processes messages sequentially in response to messages it receives. | ||||||
|  |  * | ||||||
|  |  * @param T The type of messages this actor will process | ||||||
|  |  * @param channelCapacity The capacity of the [Channel] used for message delibery to the actor. Defaults to [Channel.UNLIMITED] | ||||||
|  |  * @param block The processing logic to be applied to each received message | ||||||
|  |  * @return A [Channel] that can be used to send messages to this actor or cancel it | ||||||
|  |  */ | ||||||
| fun <T> CoroutineScope.actor( | fun <T> CoroutineScope.actor( | ||||||
|     channelCapacity: Int = Channel.UNLIMITED, |     channelCapacity: Int = Channel.UNLIMITED, | ||||||
|     block: suspend (T) -> Unit |     block: suspend (T) -> Unit | ||||||
| @@ -13,6 +22,16 @@ fun <T> CoroutineScope.actor( | |||||||
|     return channel |     return channel | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Creates a safe actor that catches and handles exceptions during message processing. | ||||||
|  |  * This variant wraps the processing logic in a safety mechanism to prevent actor failure due to exceptions. | ||||||
|  |  * | ||||||
|  |  * @param T The type of messages this actor will process | ||||||
|  |  * @param channelCapacity The capacity of the [Channel] used for message processing. Defaults to [Channel.UNLIMITED] | ||||||
|  |  * @param onException Handler for exceptions that occur during message processing. Defaults to [defaultSafelyExceptionHandler] | ||||||
|  |  * @param block The processing logic to be applied to each received message | ||||||
|  |  * @return A [Channel] that can be used to send messages to this actor | ||||||
|  |  */ | ||||||
| inline fun <T> CoroutineScope.safeActor( | inline fun <T> CoroutineScope.safeActor( | ||||||
|     channelCapacity: Int = Channel.UNLIMITED, |     channelCapacity: Int = Channel.UNLIMITED, | ||||||
|     noinline onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler, |     noinline onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler, | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -30,3 +30,13 @@ allprojects { | |||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | tasks.register("getPublishableModules") { | ||||||
|  |     doLast { | ||||||
|  |         rootProject.subprojects.each { project -> | ||||||
|  |             if (project.plugins.hasPlugin('maven-publish')) { | ||||||
|  |                 println(":${project.name}") | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -11,12 +11,20 @@ private String getCurrentVersionChangelog() { | |||||||
|     return changelogDataOS.toString().trim() |     return changelogDataOS.toString().trim() | ||||||
| } | } | ||||||
|  |  | ||||||
| if (new File(projectDir, "secret.gradle").exists()) { |  | ||||||
|     apply from: './secret.gradle' | def githubTokenVariableName = "GITHUB_RELEASE_TOKEN" | ||||||
|  | def githubTokenVariableFromEnv = System.getenv(githubTokenVariableName) | ||||||
|  |  | ||||||
|  | def secretFile = new File(projectDir, "secret.gradle") | ||||||
|  | if (secretFile.exists() || project.hasProperty(githubTokenVariableName) || (githubTokenVariableFromEnv != "" && githubTokenVariableFromEnv != null)) { | ||||||
|  |     if (secretFile.exists()) { | ||||||
|  |         apply from: './secret.gradle' | ||||||
|  |     } | ||||||
|     apply plugin: "com.github.breadmoirai.github-release" |     apply plugin: "com.github.breadmoirai.github-release" | ||||||
|  |     def githubReleaseToken = project.hasProperty(githubTokenVariableName) ? project.property(githubTokenVariableName).toString() : githubTokenVariableFromEnv | ||||||
|  |  | ||||||
|     githubRelease { |     githubRelease { | ||||||
|         token "${project.property('GITHUB_RELEASE_TOKEN')}" |         token githubReleaseToken | ||||||
|  |  | ||||||
|         owner = "InsanusMokrassar" |         owner = "InsanusMokrassar" | ||||||
|         repo = "MicroUtils" |         repo = "MicroUtils" | ||||||
|   | |||||||
| @@ -15,5 +15,5 @@ crypto_js_version=4.1.1 | |||||||
| # Project data | # Project data | ||||||
|  |  | ||||||
| group=dev.inmo | group=dev.inmo | ||||||
| version=0.25.4 | version=0.25.8 | ||||||
| android_code_version=294 | android_code_version=298 | ||||||
|   | |||||||
							
								
								
									
										7
									
								
								gradle/karma.config.d/timeout.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								gradle/karma.config.d/timeout.js
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,7 @@ | |||||||
|  | config.set({ | ||||||
|  |     client: { | ||||||
|  |         mocha: { | ||||||
|  |             timeout: 240000 | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | }); | ||||||
| @@ -1,46 +1,49 @@ | |||||||
| [versions] | [versions] | ||||||
|  |  | ||||||
| kt = "2.1.20" | kt = "2.1.21" | ||||||
| kt-serialization = "1.8.0" | kt-serialization = "1.8.1" | ||||||
| kt-coroutines = "1.10.1" | kt-coroutines = "1.10.2" | ||||||
|  |  | ||||||
| kslog = "1.4.1" | kotlinx-browser = "0.3" | ||||||
|  |  | ||||||
| jb-compose = "1.7.3" | kslog = "1.4.2" | ||||||
| jb-exposed = "0.60.0" |  | ||||||
|  | jb-compose = "1.8.1" | ||||||
|  | jb-exposed = "0.61.0" | ||||||
| jb-dokka = "2.0.0" | jb-dokka = "2.0.0" | ||||||
|  |  | ||||||
| sqlite = "3.49.1.0" | sqlite = "3.50.1.0" | ||||||
|  |  | ||||||
| korlibs = "5.4.0" | korlibs = "5.4.0" | ||||||
| uuid = "0.8.4" | uuid = "0.8.4" | ||||||
|  |  | ||||||
| ktor = "3.1.2" | ktor = "3.1.3" | ||||||
|  |  | ||||||
| gh-release = "2.5.2" | gh-release = "2.5.2" | ||||||
|  |  | ||||||
| koin = "4.0.4" | koin = "4.0.4" | ||||||
|  |  | ||||||
| okio = "3.10.2" | okio = "3.12.0" | ||||||
|  |  | ||||||
| ksp = "2.1.20-1.0.31" | ksp = "2.1.20-1.0.31" | ||||||
| kotlin-poet = "1.18.1" | kotlin-poet = "1.18.1" | ||||||
|  |  | ||||||
| versions = "0.51.0" | versions = "0.51.0" | ||||||
|  | nmcp = "0.1.5" | ||||||
|  |  | ||||||
| android-gradle = "8.7.+" | android-gradle = "8.9.+" | ||||||
| dexcount = "4.0.0" | dexcount = "4.0.0" | ||||||
|  |  | ||||||
| android-coreKtx = "1.15.0" | android-coreKtx = "1.16.0" | ||||||
| android-recyclerView = "1.4.0" | android-recyclerView = "1.4.0" | ||||||
| android-appCompat = "1.7.0" | android-appCompat = "1.7.1" | ||||||
| android-fragment = "1.8.6" | android-fragment = "1.8.8" | ||||||
| android-espresso = "3.6.1" | android-espresso = "3.6.1" | ||||||
| android-test = "1.2.1" | android-test = "1.2.1" | ||||||
|  |  | ||||||
| android-props-minSdk = "21" | android-props-minSdk = "21" | ||||||
| android-props-compileSdk = "35" | android-props-compileSdk = "36" | ||||||
| android-props-buildTools = "35.0.0" | android-props-buildTools = "36.0.0" | ||||||
|  |  | ||||||
| [libraries] | [libraries] | ||||||
|  |  | ||||||
| @@ -55,6 +58,7 @@ kt-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-and | |||||||
| kt-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kt-coroutines" } | kt-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kt-coroutines" } | ||||||
| kt-coroutines-debug = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-debug", version.ref = "kt-coroutines" } | kt-coroutines-debug = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-debug", version.ref = "kt-coroutines" } | ||||||
|  |  | ||||||
|  | kotlinx-browser = { module = "org.jetbrains.kotlinx:kotlinx-browser-wasm-js", version.ref = "kotlinx-browser" } | ||||||
|  |  | ||||||
| ktor-io = { module = "io.ktor:ktor-io", version.ref = "ktor" } | ktor-io = { module = "io.ktor:ktor-io", version.ref = "ktor" } | ||||||
| ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" } | ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" } | ||||||
| @@ -120,3 +124,4 @@ jb-compose = { id = "org.jetbrains.compose", version.ref = "jb-compose" } | |||||||
| kt-jb-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kt" } | kt-jb-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kt" } | ||||||
|  |  | ||||||
| versions = { id = "com.github.ben-manes.versions", version.ref = "versions" } | versions = { id = "com.github.ben-manes.versions", version.ref = "versions" } | ||||||
|  | nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" } | ||||||
|   | |||||||
							
								
								
									
										9
									
								
								gradle/templates/addCompose.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								gradle/templates/addCompose.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | |||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         commonMain { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation compose.runtime | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										9
									
								
								gradle/templates/addComposeForAndroid.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								gradle/templates/addComposeForAndroid.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | |||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         androidUnitTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation compose.uiTest | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										15
									
								
								gradle/templates/addComposeForDesktop.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								gradle/templates/addComposeForDesktop.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,15 @@ | |||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         jvmMain { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation compose.desktop.currentOs | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         jvmTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('test-junit') | ||||||
|  |                 implementation compose.uiTest | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										9
									
								
								gradle/templates/addComposeForJs.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								gradle/templates/addComposeForJs.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | |||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         jsMain { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation compose.web.core | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										24
									
								
								gradle/templates/defaultProject.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								gradle/templates/defaultProject.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,24 @@ | |||||||
|  | project.version = "$version" | ||||||
|  | project.group = "$group" | ||||||
|  |  | ||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         commonMain { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('stdlib') | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         commonTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('test-common') | ||||||
|  |                 implementation kotlin('test-annotations-common') | ||||||
|  |                 implementation libs.kt.coroutines.test | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | java { | ||||||
|  |     sourceCompatibility = JavaVersion.VERSION_17 | ||||||
|  |     targetCompatibility = JavaVersion.VERSION_17 | ||||||
|  | } | ||||||
							
								
								
									
										25
									
								
								gradle/templates/defaultProjectWithSerialization.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								gradle/templates/defaultProjectWithSerialization.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,25 @@ | |||||||
|  | project.version = "$version" | ||||||
|  | project.group = "$group" | ||||||
|  |  | ||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         commonMain { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('stdlib') | ||||||
|  |                 api libs.kt.serialization | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         commonTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('test-common') | ||||||
|  |                 implementation kotlin('test-annotations-common') | ||||||
|  |                 implementation libs.kt.coroutines.test | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | java { | ||||||
|  |     sourceCompatibility = JavaVersion.VERSION_17 | ||||||
|  |     targetCompatibility = JavaVersion.VERSION_17 | ||||||
|  | } | ||||||
							
								
								
									
										31
									
								
								gradle/templates/enableMPPAndroid.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										31
									
								
								gradle/templates/enableMPPAndroid.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,31 @@ | |||||||
|  | kotlin { | ||||||
|  |     androidTarget { | ||||||
|  |         publishAllLibraryVariants() | ||||||
|  |         compilations.all { | ||||||
|  |             kotlinOptions { | ||||||
|  |                 jvmTarget = "17" | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     sourceSets { | ||||||
|  |         androidUnitTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('test-junit') | ||||||
|  |                 implementation libs.android.test.junit | ||||||
|  |                 implementation libs.android.espresso | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         androidInstrumentedTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('test-junit') | ||||||
|  |                 implementation libs.android.test.junit | ||||||
|  |                 implementation libs.android.espresso | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         androidMain.dependsOn jvmMain | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | apply from: "$defaultAndroidSettings" | ||||||
							
								
								
									
										30
									
								
								gradle/templates/enableMPPJs.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								gradle/templates/enableMPPJs.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,30 @@ | |||||||
|  | kotlin { | ||||||
|  |     js (IR) { | ||||||
|  |         browser { | ||||||
|  |             testTask { | ||||||
|  |                 useMocha { | ||||||
|  |                     timeout = "240000" | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         nodejs { | ||||||
|  |             testTask { | ||||||
|  |                 useMocha { | ||||||
|  |                     timeout = "240000" | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     sourceSets { | ||||||
|  |         jsMain { | ||||||
|  |             dependencies { | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         jsTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('test-js') | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										21
									
								
								gradle/templates/enableMPPJvm.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								gradle/templates/enableMPPJvm.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,21 @@ | |||||||
|  | kotlin { | ||||||
|  |     jvm { | ||||||
|  |         compilations.main { | ||||||
|  |             kotlinOptions { | ||||||
|  |                 jvmTarget = "17" | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     sourceSets { | ||||||
|  |         jvmMain { | ||||||
|  |             dependencies { | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         jvmTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('test-junit') | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										8
									
								
								gradle/templates/enableMPPNativeArm64.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								gradle/templates/enableMPPNativeArm64.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,8 @@ | |||||||
|  | kotlin { | ||||||
|  |     linuxArm64() | ||||||
|  |  | ||||||
|  |     sourceSets { | ||||||
|  |         nativeMain.dependsOn commonMain | ||||||
|  |         linuxArm64Main.dependsOn nativeMain | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										10
									
								
								gradle/templates/enableMPPNativeX64.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								gradle/templates/enableMPPNativeX64.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,10 @@ | |||||||
|  | kotlin { | ||||||
|  |     linuxX64() | ||||||
|  |     mingwX64() | ||||||
|  |  | ||||||
|  |     sourceSets { | ||||||
|  |         nativeMain.dependsOn commonMain | ||||||
|  |         linuxX64Main.dependsOn nativeMain | ||||||
|  |         mingwX64Main.dependsOn nativeMain | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										27
									
								
								gradle/templates/enableMPPWasmJs.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								gradle/templates/enableMPPWasmJs.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,27 @@ | |||||||
|  | kotlin { | ||||||
|  |     wasmJs { | ||||||
|  |         browser { | ||||||
|  |             testTask { | ||||||
|  |                 useKarma { | ||||||
|  |                     useChromeHeadless() | ||||||
|  |                     useConfigDirectory(rootProject.relativeProjectPath("gradle/karma.config.d")) | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         nodejs { | ||||||
|  |             testTask { | ||||||
|  |                 timeout = Duration.ofSeconds(240) | ||||||
|  |                 nodeJsArgs.add("--unhandled-rejections=warn") | ||||||
|  |                 nodeJsArgs.add("--trace-warnings") | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     sourceSets { | ||||||
|  |         wasmJsTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('test-wasm-js') | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -1,37 +1,6 @@ | |||||||
| project.version = "$version" | apply from: "$defaultProject" | ||||||
| project.group = "$group" | apply from: "$enableMPPJvm" | ||||||
|  | apply from: "$enableMPPJs" | ||||||
|  | apply from: "$enableMPPWasmJs" | ||||||
|  | apply from: "$enableMPPAndroid" | ||||||
| apply from: "$publish" | apply from: "$publish" | ||||||
|  |  | ||||||
| kotlin { |  | ||||||
|     androidTarget { |  | ||||||
|         publishAllLibraryVariants() |  | ||||||
|         compilations.all { |  | ||||||
|             kotlinOptions { |  | ||||||
|                 jvmTarget = "17" |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     sourceSets { |  | ||||||
|         commonMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('stdlib') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         commonTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-common') |  | ||||||
|                 implementation kotlin('test-annotations-common') |  | ||||||
|                 implementation libs.kt.coroutines.test |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| apply from: "$defaultAndroidSettings" |  | ||||||
|  |  | ||||||
| java { |  | ||||||
|     sourceCompatibility = JavaVersion.VERSION_17 |  | ||||||
|     targetCompatibility = JavaVersion.VERSION_17 |  | ||||||
| } |  | ||||||
|   | |||||||
| @@ -1,108 +0,0 @@ | |||||||
| project.version = "$version" |  | ||||||
| project.group = "$group" |  | ||||||
|  |  | ||||||
| apply from: "$publish" |  | ||||||
|  |  | ||||||
| kotlin { |  | ||||||
|     jvm { |  | ||||||
|         compilations.main { |  | ||||||
|             kotlinOptions { |  | ||||||
|                 jvmTarget = "17" |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     js (IR) { |  | ||||||
|         browser { |  | ||||||
|             testTask { |  | ||||||
|                 useMocha { |  | ||||||
|                     timeout = "240000" |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         nodejs { |  | ||||||
|             testTask { |  | ||||||
|                 useMocha { |  | ||||||
|                     timeout = "240000" |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     androidTarget { |  | ||||||
|         publishAllLibraryVariants() |  | ||||||
|         compilations.all { |  | ||||||
|             kotlinOptions { |  | ||||||
|                 jvmTarget = "17" |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     linuxX64() |  | ||||||
|     mingwX64() |  | ||||||
|     linuxArm64() |  | ||||||
|  |  | ||||||
|     sourceSets { |  | ||||||
|         commonMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('stdlib') |  | ||||||
|                 implementation compose.runtime |  | ||||||
|                 api libs.kt.serialization |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         commonTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-common') |  | ||||||
|                 implementation kotlin('test-annotations-common') |  | ||||||
|                 implementation libs.kt.coroutines.test |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         androidUnitTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|                 implementation libs.android.test.junit |  | ||||||
|                 implementation libs.android.espresso |  | ||||||
|                 implementation compose.uiTest |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         androidInstrumentedTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|                 implementation libs.android.test.junit |  | ||||||
|                 implementation libs.android.espresso |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jvmMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation compose.desktop.currentOs |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jvmTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|                 implementation compose.uiTest |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jsMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation compose.web.core |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jsTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-js') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         nativeMain.dependsOn commonMain |  | ||||||
|         linuxX64Main.dependsOn nativeMain |  | ||||||
|         mingwX64Main.dependsOn nativeMain |  | ||||||
|         linuxArm64Main.dependsOn nativeMain |  | ||||||
|  |  | ||||||
|         androidMain.dependsOn jvmMain |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| apply from: "$defaultAndroidSettings" |  | ||||||
|  |  | ||||||
| java { |  | ||||||
|     sourceCompatibility = JavaVersion.VERSION_17 |  | ||||||
|     targetCompatibility = JavaVersion.VERSION_17 |  | ||||||
| } |  | ||||||
| @@ -0,0 +1,12 @@ | |||||||
|  | apply from: "$defaultProjectWithSerialization" | ||||||
|  | apply from: "$enableMPPJvm" | ||||||
|  | apply from: "$enableMPPJs" | ||||||
|  | apply from: "$enableMPPWasmJs" | ||||||
|  | apply from: "$enableMPPAndroid" | ||||||
|  | apply from: "$enableMPPNativeX64" | ||||||
|  | apply from: "$enableMPPNativeArm64" | ||||||
|  | apply from: "$addCompose" | ||||||
|  | apply from: "$addComposeForAndroid" | ||||||
|  | apply from: "$addComposeForDesktop" | ||||||
|  | apply from: "$addComposeForJs" | ||||||
|  | apply from: "$publish" | ||||||
| @@ -1,40 +1,3 @@ | |||||||
| project.version = "$version" | apply from: "$defaultProject" | ||||||
| project.group = "$group" | apply from: "$enableMPPJvm" | ||||||
|  |  | ||||||
| apply from: "$publish" | apply from: "$publish" | ||||||
|  |  | ||||||
| kotlin { |  | ||||||
|     jvm { |  | ||||||
|         compilations.main { |  | ||||||
|             kotlinOptions { |  | ||||||
|                 jvmTarget = "17" |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     sourceSets { |  | ||||||
|         commonMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('stdlib') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         commonTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-common') |  | ||||||
|                 implementation kotlin('test-annotations-common') |  | ||||||
|                 implementation libs.kt.coroutines.test |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         jvmTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| java { |  | ||||||
|     sourceCompatibility = JavaVersion.VERSION_17 |  | ||||||
|     targetCompatibility = JavaVersion.VERSION_17 |  | ||||||
| } |  | ||||||
|   | |||||||
| @@ -1,88 +0,0 @@ | |||||||
| project.version = "$version" |  | ||||||
| project.group = "$group" |  | ||||||
|  |  | ||||||
| apply from: "$publish" |  | ||||||
|  |  | ||||||
| kotlin { |  | ||||||
|     jvm { |  | ||||||
|         compilations.main { |  | ||||||
|             kotlinOptions { |  | ||||||
|                 jvmTarget = "17" |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     js (IR) { |  | ||||||
|         browser { |  | ||||||
|             testTask { |  | ||||||
|                 useMocha { |  | ||||||
|                     timeout = "240000" |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         nodejs { |  | ||||||
|             testTask { |  | ||||||
|                 useMocha { |  | ||||||
|                     timeout = "240000" |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     androidTarget { |  | ||||||
|         publishAllLibraryVariants() |  | ||||||
|         compilations.all { |  | ||||||
|             kotlinOptions { |  | ||||||
|                 jvmTarget = "17" |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     linuxX64() |  | ||||||
|     mingwX64() |  | ||||||
|     linuxArm64() |  | ||||||
|  |  | ||||||
|     sourceSets { |  | ||||||
|         commonMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('stdlib') |  | ||||||
|                 api libs.kt.serialization |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         commonTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test') |  | ||||||
|                 implementation kotlin('test-annotations-common') |  | ||||||
|                 implementation libs.kt.coroutines.test |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         androidUnitTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|                 implementation libs.android.test.junit |  | ||||||
|                 implementation libs.android.espresso |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jvmTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jsTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-js') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         nativeMain.dependsOn commonMain |  | ||||||
|         linuxX64Main.dependsOn nativeMain |  | ||||||
|         mingwX64Main.dependsOn nativeMain |  | ||||||
|         linuxArm64Main.dependsOn nativeMain |  | ||||||
|  |  | ||||||
|         androidMain.dependsOn jvmMain |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| apply from: "$defaultAndroidSettings" |  | ||||||
|  |  | ||||||
| java { |  | ||||||
|     sourceCompatibility = JavaVersion.VERSION_17 |  | ||||||
|     targetCompatibility = JavaVersion.VERSION_17 |  | ||||||
| } |  | ||||||
| @@ -1,70 +0,0 @@ | |||||||
| project.version = "$version" |  | ||||||
| project.group = "$group" |  | ||||||
|  |  | ||||||
| apply from: "$publish" |  | ||||||
|  |  | ||||||
| kotlin { |  | ||||||
|     jvm { |  | ||||||
|         compilations.main { |  | ||||||
|             kotlinOptions { |  | ||||||
|                 jvmTarget = "17" |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     js (IR) { |  | ||||||
|         browser { |  | ||||||
|             testTask { |  | ||||||
|                 useMocha { |  | ||||||
|                     timeout = "240000" |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         nodejs { |  | ||||||
|             testTask { |  | ||||||
|                 useMocha { |  | ||||||
|                     timeout = "240000" |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     linuxX64() |  | ||||||
|     mingwX64() |  | ||||||
|  |  | ||||||
|     sourceSets { |  | ||||||
|         commonMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('stdlib') |  | ||||||
|                 api libs.kt.serialization |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         commonTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-common') |  | ||||||
|                 implementation kotlin('test-annotations-common') |  | ||||||
|                 implementation libs.kt.coroutines.test |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         jvmTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jsTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-js') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         nativeMain.dependsOn commonMain |  | ||||||
|         linuxX64Main.dependsOn nativeMain |  | ||||||
|         mingwX64Main.dependsOn nativeMain |  | ||||||
|  |  | ||||||
|         androidMain.dependsOn jvmMain |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| java { |  | ||||||
|     sourceCompatibility = JavaVersion.VERSION_17 |  | ||||||
|     targetCompatibility = JavaVersion.VERSION_17 |  | ||||||
| } |  | ||||||
| @@ -0,0 +1,8 @@ | |||||||
|  | apply from: "$defaultProjectWithSerialization" | ||||||
|  | apply from: "$enableMPPJvm" | ||||||
|  | apply from: "$enableMPPJs" | ||||||
|  | apply from: "$enableMPPWasmJs" | ||||||
|  | apply from: "$enableMPPAndroid" | ||||||
|  | apply from: "$enableMPPNativeX64" | ||||||
|  | apply from: "$enableMPPNativeArm64" | ||||||
|  | apply from: "$publish" | ||||||
							
								
								
									
										6
									
								
								gradle/templates/mppJvmJsWasmJsLinuxMingwProject.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								gradle/templates/mppJvmJsWasmJsLinuxMingwProject.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,6 @@ | |||||||
|  | apply from: "$defaultProjectWithSerialization" | ||||||
|  | apply from: "$enableMPPJvm" | ||||||
|  | apply from: "$enableMPPJs" | ||||||
|  | apply from: "$enableMPPWasmJs" | ||||||
|  | apply from: "$enableMPPNativeX64" | ||||||
|  | apply from: "$publish" | ||||||
| @@ -1,98 +1,10 @@ | |||||||
| project.version = "$version" | apply from: "$defaultProjectWithSerialization" | ||||||
| project.group = "$group" | apply from: "$enableMPPJvm" | ||||||
|  | apply from: "$enableMPPJs" | ||||||
|  | apply from: "$enableMPPWasmJs" | ||||||
|  | apply from: "$enableMPPAndroid" | ||||||
|  | apply from: "$addCompose" | ||||||
|  | apply from: "$addComposeForAndroid" | ||||||
|  | apply from: "$addComposeForDesktop" | ||||||
|  | apply from: "$addComposeForJs" | ||||||
| apply from: "$publish" | apply from: "$publish" | ||||||
|  |  | ||||||
| kotlin { |  | ||||||
|     jvm { |  | ||||||
|         compilations.main { |  | ||||||
|             kotlinOptions { |  | ||||||
|                 jvmTarget = "17" |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     js (IR) { |  | ||||||
|         browser { |  | ||||||
|             testTask { |  | ||||||
|                 useMocha { |  | ||||||
|                     timeout = "240000" |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         nodejs { |  | ||||||
|             testTask { |  | ||||||
|                 useMocha { |  | ||||||
|                     timeout = "240000" |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     androidTarget { |  | ||||||
|         publishAllLibraryVariants() |  | ||||||
|         compilations.all { |  | ||||||
|             kotlinOptions { |  | ||||||
|                 jvmTarget = "17" |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     sourceSets { |  | ||||||
|         commonMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('stdlib') |  | ||||||
|                 implementation compose.runtime |  | ||||||
|                 api libs.kt.serialization |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         commonTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-common') |  | ||||||
|                 implementation kotlin('test-annotations-common') |  | ||||||
|                 implementation libs.kt.coroutines.test |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jvmMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation compose.desktop.currentOs |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jvmTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|                 implementation compose.uiTest |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jsMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation compose.web.core |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jsTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-js') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         androidUnitTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|                 implementation libs.android.test.junit |  | ||||||
|                 implementation libs.android.espresso |  | ||||||
|                 implementation compose.uiTest |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| apply from: "$defaultAndroidSettings" |  | ||||||
|  |  | ||||||
| java { |  | ||||||
|     sourceCompatibility = JavaVersion.VERSION_17 |  | ||||||
|     targetCompatibility = JavaVersion.VERSION_17 |  | ||||||
| } |  | ||||||
|  |  | ||||||
|  |  | ||||||
| //compose { |  | ||||||
| //    if (composePluginKotlinVersion != null && !composePluginKotlinVersion.isEmpty()) { |  | ||||||
| //        kotlinCompilerPlugin.set(composePluginKotlinVersion) |  | ||||||
| //    } |  | ||||||
| //} |  | ||||||
|   | |||||||
| @@ -1,7 +1,3 @@ | |||||||
| if (ext.getProperties()["do_publish"] == false) { |  | ||||||
|     return |  | ||||||
| } |  | ||||||
|  |  | ||||||
| apply plugin: 'maven-publish' | apply plugin: 'maven-publish' | ||||||
|  |  | ||||||
| task javadocsJar(type: Jar) { | task javadocsJar(type: Jar) { | ||||||
| @@ -23,72 +19,64 @@ publishing { | |||||||
|             } |             } | ||||||
|  |  | ||||||
|             developers { |             developers { | ||||||
|  |                 developer { | ||||||
|  |                     id = "InsanusMokrassar" | ||||||
|  |                     name = "Aleksei Ovsiannikov" | ||||||
|  |                     email = "ovsyannikov.alexey95@gmail.com" | ||||||
|  |                 } | ||||||
|  |  | ||||||
|                     developer { |                 developer { | ||||||
|                         id = "InsanusMokrassar" |                     id = "000Sanya" | ||||||
|                         name = "Aleksei Ovsiannikov" |                     name = "Syrov Aleksandr" | ||||||
|                         email = "ovsyannikov.alexey95@gmail.com" |                     email = "000sanya.000sanya@gmail.com" | ||||||
|                     } |                 } | ||||||
|  |  | ||||||
|  |  | ||||||
|                     developer { |  | ||||||
|                         id = "000Sanya" |  | ||||||
|                         name = "Syrov Aleksandr" |  | ||||||
|                         email = "000sanya.000sanya@gmail.com" |  | ||||||
|                     } |  | ||||||
|  |  | ||||||
|             } |             } | ||||||
|  |  | ||||||
|             licenses { |             licenses { | ||||||
|  |                 license { | ||||||
|                     license { |                     name = "Apache Software License 2.0" | ||||||
|                         name = "Apache Software License 2.0" |                     url = "https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE" | ||||||
|                         url = "https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE" |                 } | ||||||
|                     } |  | ||||||
|  |  | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|         repositories { |     } | ||||||
|             if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) { |     repositories { | ||||||
|                 maven { |         if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) { | ||||||
|                     name = "GithubPackages" |             maven { | ||||||
|                     url = uri("https://maven.pkg.github.com/InsanusMokrassar/MicroUtils") |                 name = "GithubPackages" | ||||||
|  |                 url = uri("https://maven.pkg.github.com/InsanusMokrassar/MicroUtils") | ||||||
|                     credentials { |          | ||||||
|                         username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER') |                 credentials { | ||||||
|                         password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD') |                     username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER') | ||||||
|                     } |                     password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD') | ||||||
|  |  | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|             if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) { |         } | ||||||
|                 maven { |         if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) { | ||||||
|                     name = "InmoNexus" |             maven { | ||||||
|                     url = uri("https://nexus.inmo.dev/repository/maven-releases/") |                 name = "InmoNexus" | ||||||
|  |                 url = uri("https://nexus.inmo.dev/repository/maven-releases/") | ||||||
|                     credentials { |          | ||||||
|                         username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER') |                 credentials { | ||||||
|                         password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD') |                     username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER') | ||||||
|                     } |                     password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD') | ||||||
|  |  | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|             if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) { |         } | ||||||
|                 maven { |         if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) { | ||||||
|                     name = "sonatype" |             maven { | ||||||
|                     url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") |                 name = "sonatype" | ||||||
|  |                 url = uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/") | ||||||
|                     credentials { |          | ||||||
|                         username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER') |                 credentials { | ||||||
|                         password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD') |                     username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER') | ||||||
|                     } |                     password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD') | ||||||
|  |  | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |      | ||||||
| if (project.hasProperty("signing.gnupg.keyName")) { | if (project.hasProperty("signing.gnupg.keyName")) { | ||||||
|     apply plugin: 'signing' |     apply plugin: 'signing' | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1 +1 @@ | |||||||
| {"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"It is set of projects with micro tools for avoiding of routines coding","url":"https://github.com/InsanusMokrassar/MicroUtils/","vcsUrl":"https://github.com/InsanusMokrassar/MicroUtils.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"},{"id":"000Sanya","name":"Syrov Aleksandr","eMail":"000sanya.000sanya@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/MicroUtils"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}} | {"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"It is set of projects with micro tools for avoiding of routines coding","url":"https://github.com/InsanusMokrassar/MicroUtils/","vcsUrl":"https://github.com/InsanusMokrassar/MicroUtils.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"},{"id":"000Sanya","name":"Syrov Aleksandr","eMail":"000sanya.000sanya@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/MicroUtils"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"},"includeCentralSonatypeUploadingScript":false}} | ||||||
| @@ -1,5 +1,6 @@ | |||||||
| apply plugin: 'maven-publish' | apply plugin: 'maven-publish' | ||||||
|  |  | ||||||
|  |  | ||||||
| task javadocJar(type: Jar) { | task javadocJar(type: Jar) { | ||||||
|     from javadoc |     from javadoc | ||||||
|     archiveClassifier = 'javadoc' |     archiveClassifier = 'javadoc' | ||||||
| @@ -55,42 +56,39 @@ publishing { | |||||||
|                      |                      | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|             repositories { |         } | ||||||
|                 if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) { |     } | ||||||
|                     maven { |     repositories { | ||||||
|                         name = "GithubPackages" |         if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) { | ||||||
|                         url = uri("https://maven.pkg.github.com/InsanusMokrassar/MicroUtils") |             maven { | ||||||
|                  |                 name = "GithubPackages" | ||||||
|                         credentials { |                 url = uri("https://maven.pkg.github.com/InsanusMokrassar/MicroUtils") | ||||||
|                             username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER') |          | ||||||
|                             password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD') |                 credentials { | ||||||
|                         } |                     username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER') | ||||||
|                  |                     password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD') | ||||||
|                     } |  | ||||||
|                 } |                 } | ||||||
|                 if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) { |             } | ||||||
|                     maven { |         } | ||||||
|                         name = "InmoNexus" |         if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) { | ||||||
|                         url = uri("https://nexus.inmo.dev/repository/maven-releases/") |             maven { | ||||||
|                  |                 name = "InmoNexus" | ||||||
|                         credentials { |                 url = uri("https://nexus.inmo.dev/repository/maven-releases/") | ||||||
|                             username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER') |          | ||||||
|                             password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD') |                 credentials { | ||||||
|                         } |                     username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER') | ||||||
|                  |                     password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD') | ||||||
|                     } |  | ||||||
|                 } |                 } | ||||||
|                 if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) { |             } | ||||||
|                     maven { |         } | ||||||
|                         name = "sonatype" |         if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) { | ||||||
|                         url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") |             maven { | ||||||
|                  |                 name = "sonatype" | ||||||
|                         credentials { |                 url = uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/") | ||||||
|                             username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER') |          | ||||||
|                             password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD') |                 credentials { | ||||||
|                         } |                     username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER') | ||||||
|                  |                     password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD') | ||||||
|                     } |  | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
| @@ -99,13 +97,13 @@ publishing { | |||||||
|  |  | ||||||
| if (project.hasProperty("signing.gnupg.keyName")) { | if (project.hasProperty("signing.gnupg.keyName")) { | ||||||
|     apply plugin: 'signing' |     apply plugin: 'signing' | ||||||
|      |  | ||||||
|     signing { |     signing { | ||||||
|         useGpgCmd() |         useGpgCmd() | ||||||
|      |  | ||||||
|         sign publishing.publications |         sign publishing.publications | ||||||
|     } |     } | ||||||
|      |  | ||||||
|     task signAll { |     task signAll { | ||||||
|         tasks.withType(Sign).forEach { |         tasks.withType(Sign).forEach { | ||||||
|             dependsOn(it) |             dependsOn(it) | ||||||
|   | |||||||
| @@ -1 +1 @@ | |||||||
| {"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"It is set of projects with micro tools for avoiding of routines coding","url":"https://github.com/InsanusMokrassar/MicroUtils/","vcsUrl":"https://github.com/InsanusMokrassar/MicroUtils.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"},{"id":"000Sanya","name":"Syrov Aleksandr","eMail":"000sanya.000sanya@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/MicroUtils"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"} | {"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"It is set of projects with micro tools for avoiding of routines coding","url":"https://github.com/InsanusMokrassar/MicroUtils/","vcsUrl":"https://github.com/InsanusMokrassar/MicroUtils.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"},{"id":"000Sanya","name":"Syrov Aleksandr","eMail":"000sanya.000sanya@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/MicroUtils"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"},"includeCentralSonatypeUploadingScript":false},"type":"JVM"} | ||||||
							
								
								
									
										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-8.12.1-bin.zip | distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip | ||||||
| zipStoreBase=GRADLE_USER_HOME | zipStoreBase=GRADLE_USER_HOME | ||||||
| zipStorePath=wrapper/dists | zipStorePath=wrapper/dists | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -5,7 +5,7 @@ plugins { | |||||||
|     id "com.google.devtools.ksp" |     id "com.google.devtools.ksp" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|   | |||||||
| @@ -4,8 +4,14 @@ import org.koin.core.definition.Definition | |||||||
| import org.koin.core.module.Module | import org.koin.core.module.Module | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Will be useful in case you need to declare some singles with one type several types, but need to separate them and do |  * Declares a factory with a random qualifier in the Koin module. | ||||||
|  * not care about how :) |  * This is useful when you need to declare multiple factory definitions of the same type | ||||||
|  |  * but want them to be uniquely identifiable without manually specifying qualifiers. | ||||||
|  |  * Unlike singles, factories create a new instance each time they are requested. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to be created by the factory | ||||||
|  |  * @param definition The definition function that creates new instances | ||||||
|  |  * @return A Koin definition for the factory with a random qualifier | ||||||
|  */ |  */ | ||||||
| inline fun <reified T : Any> Module.factoryWithRandomQualifier( | inline fun <reified T : Any> Module.factoryWithRandomQualifier( | ||||||
|     noinline definition: Definition<T> |     noinline definition: Definition<T> | ||||||
|   | |||||||
| @@ -4,6 +4,16 @@ import org.koin.core.definition.Definition | |||||||
| import org.koin.core.module.Module | import org.koin.core.module.Module | ||||||
| import org.koin.core.qualifier.StringQualifier | import org.koin.core.qualifier.StringQualifier | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Declares a factory with a string qualifier in the Koin module. | ||||||
|  |  * This is a convenience function that wraps the string qualifier in a [StringQualifier]. | ||||||
|  |  * Unlike singles, factories create a new instance each time they are requested. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to be created by the factory | ||||||
|  |  * @param qualifier The string value to be used as a qualifier | ||||||
|  |  * @param definition The definition function that creates new instances | ||||||
|  |  * @return A Koin definition for the factory with the specified string qualifier | ||||||
|  |  */ | ||||||
| inline fun <reified T : Any> Module.factory( | inline fun <reified T : Any> Module.factory( | ||||||
|     qualifier: String, |     qualifier: String, | ||||||
|     noinline definition: Definition<T> |     noinline definition: Definition<T> | ||||||
|   | |||||||
| @@ -3,6 +3,21 @@ package dev.inmo.micro_utils.koin | |||||||
| import org.koin.core.Koin | import org.koin.core.Koin | ||||||
| import org.koin.core.scope.Scope | import org.koin.core.scope.Scope | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves all instances of type [T] from the current [Scope] and returns them as a distinct list. | ||||||
|  |  * This function is useful when you want to avoid duplicate instances of the same type. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instances to retrieve | ||||||
|  |  * @return A list of distinct instances of type [T] | ||||||
|  |  */ | ||||||
| inline fun <reified T : Any> Scope.getAllDistinct() = getAll<T>().distinct() | inline fun <reified T : Any> Scope.getAllDistinct() = getAll<T>().distinct() | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves all instances of type [T] from the [Koin] container and returns them as a distinct list. | ||||||
|  |  * This function is useful when you want to avoid duplicate instances of the same type. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instances to retrieve | ||||||
|  |  * @return A list of distinct instances of type [T] | ||||||
|  |  */ | ||||||
| inline fun <reified T : Any> Koin.getAllDistinct() = getAll<T>().distinct() | inline fun <reified T : Any> Koin.getAllDistinct() = getAll<T>().distinct() | ||||||
|  |  | ||||||
|   | |||||||
| @@ -3,6 +3,23 @@ package dev.inmo.micro_utils.koin | |||||||
| import org.koin.core.Koin | import org.koin.core.Koin | ||||||
| import org.koin.core.scope.Scope | import org.koin.core.scope.Scope | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves the first available instance of type [T] from the current scope. | ||||||
|  |  * This is useful when you need any instance of a type and don't care which one. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to retrieve | ||||||
|  |  * @return The first available instance of type [T] | ||||||
|  |  * @throws NoSuchElementException if no instances of type [T] are available | ||||||
|  |  */ | ||||||
| inline fun <reified T : Any> Scope.getAny() = getAll<T>().first() | inline fun <reified T : Any> Scope.getAny() = getAll<T>().first() | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves the first available instance of type [T] from the Koin container. | ||||||
|  |  * This is useful when you need any instance of a type and don't care which one. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to retrieve | ||||||
|  |  * @return The first available instance of type [T] | ||||||
|  |  * @throws NoSuchElementException if no instances of type [T] are available | ||||||
|  |  */ | ||||||
| inline fun <reified T : Any> Koin.getAny() = getAll<T>().first() | inline fun <reified T : Any> Koin.getAny() = getAll<T>().first() | ||||||
|  |  | ||||||
|   | |||||||
| @@ -7,33 +7,81 @@ import org.koin.core.instance.InstanceFactory | |||||||
| import org.koin.core.parameter.ParametersDefinition | import org.koin.core.parameter.ParametersDefinition | ||||||
| import org.koin.core.scope.Scope | import org.koin.core.scope.Scope | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves an instance of type [T] from the Koin container using a [BeanDefinition]. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to retrieve | ||||||
|  |  * @param definition The bean definition to use for instance retrieval | ||||||
|  |  * @param parameters Optional parameters to pass to the instance constructor | ||||||
|  |  * @return An instance of type [T] | ||||||
|  |  */ | ||||||
| fun <T> Koin.get(definition: BeanDefinition<T>, parameters: ParametersDefinition? = null): T = get( | fun <T> Koin.get(definition: BeanDefinition<T>, parameters: ParametersDefinition? = null): T = get( | ||||||
|     definition.primaryType, |     definition.primaryType, | ||||||
|     definition.qualifier, |     definition.qualifier, | ||||||
|     parameters |     parameters | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves an instance of type [T] from the Koin container using an [InstanceFactory]. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to retrieve | ||||||
|  |  * @param definition The instance factory to use for instance retrieval | ||||||
|  |  * @param parameters Optional parameters to pass to the instance constructor | ||||||
|  |  * @return An instance of type [T] | ||||||
|  |  */ | ||||||
| fun <T> Koin.get(definition: InstanceFactory<T>, parameters: ParametersDefinition? = null): T = get( | fun <T> Koin.get(definition: InstanceFactory<T>, parameters: ParametersDefinition? = null): T = get( | ||||||
|     definition.beanDefinition, |     definition.beanDefinition, | ||||||
|     parameters |     parameters | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves an instance of type [T] from the Koin container using a [KoinDefinition]. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to retrieve | ||||||
|  |  * @param definition The Koin definition to use for instance retrieval | ||||||
|  |  * @param parameters Optional parameters to pass to the instance constructor | ||||||
|  |  * @return An instance of type [T] | ||||||
|  |  */ | ||||||
| fun <T> Koin.get(definition: KoinDefinition<T>, parameters: ParametersDefinition? = null): T = get( | fun <T> Koin.get(definition: KoinDefinition<T>, parameters: ParametersDefinition? = null): T = get( | ||||||
|     definition.factory, |     definition.factory, | ||||||
|     parameters |     parameters | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves an instance of type [T] from the current scope using a [BeanDefinition]. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to retrieve | ||||||
|  |  * @param definition The bean definition to use for instance retrieval | ||||||
|  |  * @param parameters Optional parameters to pass to the instance constructor | ||||||
|  |  * @return An instance of type [T] | ||||||
|  |  */ | ||||||
| fun <T> Scope.get(definition: BeanDefinition<T>, parameters: ParametersDefinition? = null): T = get( | fun <T> Scope.get(definition: BeanDefinition<T>, parameters: ParametersDefinition? = null): T = get( | ||||||
|     definition.primaryType, |     definition.primaryType, | ||||||
|     definition.qualifier, |     definition.qualifier, | ||||||
|     parameters |     parameters | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves an instance of type [T] from the current scope using an [InstanceFactory]. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to retrieve | ||||||
|  |  * @param definition The instance factory to use for instance retrieval | ||||||
|  |  * @param parameters Optional parameters to pass to the instance constructor | ||||||
|  |  * @return An instance of type [T] | ||||||
|  |  */ | ||||||
| fun <T> Scope.get(definition: InstanceFactory<T>, parameters: ParametersDefinition? = null): T = get( | fun <T> Scope.get(definition: InstanceFactory<T>, parameters: ParametersDefinition? = null): T = get( | ||||||
|     definition.beanDefinition, |     definition.beanDefinition, | ||||||
|     parameters |     parameters | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves an instance of type [T] from the current scope using a [KoinDefinition]. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to retrieve | ||||||
|  |  * @param definition The Koin definition to use for instance retrieval | ||||||
|  |  * @param parameters Optional parameters to pass to the instance constructor | ||||||
|  |  * @return An instance of type [T] | ||||||
|  |  */ | ||||||
| fun <T> Scope.get(definition: KoinDefinition<T>, parameters: ParametersDefinition? = null): T = get( | fun <T> Scope.get(definition: KoinDefinition<T>, parameters: ParametersDefinition? = null): T = get( | ||||||
|     definition.factory, |     definition.factory, | ||||||
|     parameters |     parameters | ||||||
|   | |||||||
| @@ -3,4 +3,10 @@ package dev.inmo.micro_utils.koin | |||||||
| import com.benasher44.uuid.uuid4 | import com.benasher44.uuid.uuid4 | ||||||
| import org.koin.core.qualifier.StringQualifier | import org.koin.core.qualifier.StringQualifier | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Creates a [StringQualifier] with a random string value. | ||||||
|  |  * | ||||||
|  |  * @param randomFun A function that generates a random string. By default, it uses UUID4 string representation. | ||||||
|  |  * @return A [StringQualifier] with a randomly generated string value | ||||||
|  |  */ | ||||||
| fun RandomQualifier(randomFun: () -> String = { uuid4().toString() }) = StringQualifier(randomFun()) | fun RandomQualifier(randomFun: () -> String = { uuid4().toString() }) = StringQualifier(randomFun()) | ||||||
|   | |||||||
| @@ -4,8 +4,14 @@ import org.koin.core.definition.Definition | |||||||
| import org.koin.core.module.Module | import org.koin.core.module.Module | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Will be useful in case you need to declare some singles with one type several types, but need to separate them and do |  * Declares a single instance with a random qualifier in the Koin module. | ||||||
|  * not care about how :) |  * This is useful when you need to declare multiple instances of the same type | ||||||
|  |  * but want them to be uniquely identifiable without manually specifying qualifiers. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to be created | ||||||
|  |  * @param createdAtStart Whether the instance should be created when the Koin module starts (default: false) | ||||||
|  |  * @param definition The definition function that creates the instance | ||||||
|  |  * @return A Koin definition for the single instance with a random qualifier | ||||||
|  */ |  */ | ||||||
| inline fun <reified T : Any> Module.singleWithRandomQualifier( | inline fun <reified T : Any> Module.singleWithRandomQualifier( | ||||||
|     createdAtStart: Boolean = false, |     createdAtStart: Boolean = false, | ||||||
|   | |||||||
| @@ -4,6 +4,16 @@ import org.koin.core.definition.Definition | |||||||
| import org.koin.core.module.Module | import org.koin.core.module.Module | ||||||
| import org.koin.core.qualifier.StringQualifier | import org.koin.core.qualifier.StringQualifier | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Declares a single instance with a string qualifier in the Koin module. | ||||||
|  |  * This is a convenience function that wraps the string qualifier in a [StringQualifier]. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to be created | ||||||
|  |  * @param qualifier The string value to be used as a qualifier | ||||||
|  |  * @param createdAtStart Whether the instance should be created when the Koin module starts (default: false) | ||||||
|  |  * @param definition The definition function that creates the instance | ||||||
|  |  * @return A Koin definition for the single instance with the specified string qualifier | ||||||
|  |  */ | ||||||
| inline fun <reified T : Any> Module.single( | inline fun <reified T : Any> Module.single( | ||||||
|     qualifier: String, |     qualifier: String, | ||||||
|     createdAtStart: Boolean = false, |     createdAtStart: Boolean = false, | ||||||
|   | |||||||
| @@ -4,4 +4,4 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ plugins { | |||||||
|  |  | ||||||
| ext.do_publish = false | ext.do_publish = false | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|   | |||||||
| @@ -4,4 +4,4 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ plugins { | |||||||
|  |  | ||||||
| ext.do_publish = false | ext.do_publish = false | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|   | |||||||
| @@ -4,4 +4,4 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ plugins { | |||||||
|  |  | ||||||
| ext.do_publish = false | ext.do_publish = false | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -0,0 +1,63 @@ | |||||||
|  | package dev.inmo.micro_utils.ktor.client | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.common.MPPFile | ||||||
|  | import dev.inmo.micro_utils.coroutines.LinkedSupervisorJob | ||||||
|  | import dev.inmo.micro_utils.coroutines.launchLoggingDropExceptions | ||||||
|  | import dev.inmo.micro_utils.ktor.common.TemporalFileId | ||||||
|  | import io.ktor.client.HttpClient | ||||||
|  | import io.ktor.client.content.* | ||||||
|  | import kotlinx.coroutines.* | ||||||
|  | import org.w3c.xhr.* | ||||||
|  | import org.w3c.xhr.XMLHttpRequest.Companion.DONE | ||||||
|  |  | ||||||
|  | suspend fun tempUpload( | ||||||
|  |     fullTempUploadDraftPath: String, | ||||||
|  |     file: MPPFile, | ||||||
|  |     onUpload: ProgressListener | ||||||
|  | ): TemporalFileId { | ||||||
|  |     val formData = FormData() | ||||||
|  |     val answer = CompletableDeferred<TemporalFileId>(currentCoroutineContext().job) | ||||||
|  |     val subscope = CoroutineScope(currentCoroutineContext().LinkedSupervisorJob()) | ||||||
|  |  | ||||||
|  |     formData.append( | ||||||
|  |         "data", | ||||||
|  |         file | ||||||
|  |     ) | ||||||
|  |  | ||||||
|  |     val request = XMLHttpRequest() | ||||||
|  |     request.responseType = XMLHttpRequestResponseType.TEXT | ||||||
|  |     request.upload.onprogress = { | ||||||
|  |         subscope.launchLoggingDropExceptions { onUpload.onProgress(it.loaded.toString().toLong(), it.total.toString().toLong()) } | ||||||
|  |     } | ||||||
|  |     request.onload = { | ||||||
|  |         if (request.status == 200.toShort()) { | ||||||
|  |             answer.complete(TemporalFileId(request.responseText)) | ||||||
|  |         } else { | ||||||
|  |             answer.completeExceptionally(Exception("Something went wrong: $it")) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     request.onerror = { | ||||||
|  |         answer.completeExceptionally(Exception("Something went wrong: $it")) | ||||||
|  |     } | ||||||
|  |     request.open("POST", fullTempUploadDraftPath, true) | ||||||
|  |     request.send(formData) | ||||||
|  |  | ||||||
|  |     answer.invokeOnCompletion { | ||||||
|  |         runCatching { | ||||||
|  |             if (request.readyState != DONE) { | ||||||
|  |                 request.abort() | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     return answer.await().also { | ||||||
|  |         subscope.cancel() | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  |  | ||||||
|  | actual suspend fun HttpClient.tempUpload( | ||||||
|  |     fullTempUploadDraftPath: String, | ||||||
|  |     file: MPPFile, | ||||||
|  |     onUpload: ProgressListener | ||||||
|  | ): TemporalFileId = dev.inmo.micro_utils.ktor.client.tempUpload(fullTempUploadDraftPath, file, onUpload) | ||||||
| @@ -0,0 +1,97 @@ | |||||||
|  | package dev.inmo.micro_utils.ktor.client | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.common.MPPFile | ||||||
|  | import dev.inmo.micro_utils.coroutines.LinkedSupervisorJob | ||||||
|  | import dev.inmo.micro_utils.coroutines.launchLoggingDropExceptions | ||||||
|  | import io.ktor.client.HttpClient | ||||||
|  | import io.ktor.client.content.* | ||||||
|  | import io.ktor.http.Headers | ||||||
|  | import kotlinx.coroutines.CompletableDeferred | ||||||
|  | import kotlinx.coroutines.CoroutineScope | ||||||
|  | import kotlinx.coroutines.cancel | ||||||
|  | import kotlinx.coroutines.currentCoroutineContext | ||||||
|  | import kotlinx.coroutines.job | ||||||
|  | import kotlinx.io.readByteArray | ||||||
|  | import kotlinx.serialization.DeserializationStrategy | ||||||
|  | import kotlinx.serialization.StringFormat | ||||||
|  | import kotlinx.serialization.encodeToString | ||||||
|  | import org.khronos.webgl.toInt8Array | ||||||
|  | import org.w3c.files.Blob | ||||||
|  | import org.w3c.xhr.FormData | ||||||
|  | import org.w3c.xhr.TEXT | ||||||
|  | import org.w3c.xhr.XMLHttpRequest | ||||||
|  | import org.w3c.xhr.XMLHttpRequestResponseType | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will execute submitting of multipart data request | ||||||
|  |  * | ||||||
|  |  * @param data [Map] where keys will be used as names for multipart parts and values as values. If you will pass | ||||||
|  |  * [dev.inmo.micro_utils.common.MPPFile] (File from JS or JVM platform). Also you may pass [UniUploadFileInfo] as value | ||||||
|  |  * in case you wish to pass other source of multipart binary data than regular file | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual suspend fun <T> HttpClient.uniUpload( | ||||||
|  |     url: String, | ||||||
|  |     data: Map<String, Any>, | ||||||
|  |     resultDeserializer: DeserializationStrategy<T>, | ||||||
|  |     headers: Headers, | ||||||
|  |     stringFormat: StringFormat, | ||||||
|  |     onUpload: ProgressListener | ||||||
|  | ): T? { | ||||||
|  |     val formData = FormData() | ||||||
|  |     val answer = CompletableDeferred<T?>(currentCoroutineContext().job) | ||||||
|  |     val subscope = CoroutineScope(currentCoroutineContext().LinkedSupervisorJob()) | ||||||
|  |  | ||||||
|  |     data.forEach { (k, v) -> | ||||||
|  |         when (v) { | ||||||
|  |             is MPPFile -> formData.append( | ||||||
|  |                 k, | ||||||
|  |                 v | ||||||
|  |             ) | ||||||
|  |             is UniUploadFileInfo -> formData.append( | ||||||
|  |                 k, | ||||||
|  |                 Blob(arrayOf(v.inputAllocator().readByteArray().toInt8Array()).toJsArray().unsafeCast()), | ||||||
|  |                 v.fileName.name | ||||||
|  |             ) | ||||||
|  |             else -> formData.append( | ||||||
|  |                 k, | ||||||
|  |                 stringFormat.encodeToString(v) | ||||||
|  |             ) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     val request = XMLHttpRequest() | ||||||
|  |     headers.forEach { s, strings -> | ||||||
|  |         request.setRequestHeader(s, strings.joinToString()) | ||||||
|  |     } | ||||||
|  |     request.responseType = XMLHttpRequestResponseType.TEXT | ||||||
|  |     request.upload.onprogress = { | ||||||
|  |         subscope.launchLoggingDropExceptions { onUpload.onProgress(it.loaded.toString().toLong(), it.total.toString().toLong()) } | ||||||
|  |     } | ||||||
|  |     request.onload = { | ||||||
|  |         if (request.status == 200.toShort()) { | ||||||
|  |             answer.complete( | ||||||
|  |                 stringFormat.decodeFromString(resultDeserializer, request.responseText) | ||||||
|  |             ) | ||||||
|  |         } else { | ||||||
|  |             answer.completeExceptionally(Exception("Something went wrong: $it")) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     request.onerror = { | ||||||
|  |         answer.completeExceptionally(Exception("Something went wrong: $it")) | ||||||
|  |     } | ||||||
|  |     request.open("POST", url, true) | ||||||
|  |     request.send(formData) | ||||||
|  |  | ||||||
|  |     answer.invokeOnCompletion { | ||||||
|  |         runCatching { | ||||||
|  |             if (request.readyState != XMLHttpRequest.DONE) { | ||||||
|  |                 request.abort() | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     return answer.await().also { | ||||||
|  |         subscope.cancel() | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -0,0 +1,7 @@ | |||||||
|  | package dev.inmo.micro_utils.ktor.common | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.common.* | ||||||
|  | import io.ktor.utils.io.core.ByteReadPacket | ||||||
|  | import io.ktor.utils.io.core.Input | ||||||
|  |  | ||||||
|  | actual fun MPPFile.input(): Input = ByteReadPacket(readBytes()) | ||||||
| @@ -4,4 +4,4 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|   | |||||||
| @@ -4,4 +4,4 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|   | |||||||
| @@ -4,4 +4,4 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ plugins { | |||||||
|     alias(libs.plugins.kt.jb.compose) |     alias(libs.plugins.kt.jb.compose) | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppComposeJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -65,6 +65,44 @@ class InfinityPagedComponentContext<T> internal constructor( | |||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Creates and remembers an [InfinityPagedComponentContext] for managing infinite pagination in a Compose UI. | ||||||
|  |  * This function is used to create a persistent pagination context that survives recompositions. | ||||||
|  |  * | ||||||
|  |  * @param size Number of items to load per page. | ||||||
|  |  * @param page Initial page number to start pagination from (defaults to 0). | ||||||
|  |  * @param scope [CoroutineScope] to launch pagination operations in. If not provided, a new scope will be created | ||||||
|  |  * using [rememberCoroutineScope]. | ||||||
|  |  * @param loader Suspended function that loads paginated data. Receives the current pagination context and | ||||||
|  |  * pagination parameters, and returns a [PaginationResult] containing the loaded data. | ||||||
|  |  * @return An [InfinityPagedComponentContext] instance that manages the pagination state and operations. | ||||||
|  |  */ | ||||||
|  | @Composable | ||||||
|  | fun <T> rememberInfinityPagedComponentContext( | ||||||
|  |     size: Int, | ||||||
|  |     page: Int = 0, | ||||||
|  |     scope: CoroutineScope = rememberCoroutineScope(), | ||||||
|  |     loader: suspend InfinityPagedComponentContext<T>.(Pagination) -> PaginationResult<T> | ||||||
|  | ) = remember { | ||||||
|  |     InfinityPagedComponentContext(page = page, size = size, scope = scope, loader = loader) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Composable function for managing an infinitely paged component. | ||||||
|  |  * | ||||||
|  |  * @param T The type of the paginated data. | ||||||
|  |  * @param block Composable function that renders the UI with the loaded data. When data is in loading state, block will | ||||||
|  |  * receive null as `it` parameter | ||||||
|  |  */ | ||||||
|  | @Composable | ||||||
|  | internal fun <T> InfinityPagedComponent( | ||||||
|  |     context: InfinityPagedComponentContext<T>, | ||||||
|  |     block: @Composable InfinityPagedComponentContext<T>.(List<T>?) -> Unit | ||||||
|  | ) { | ||||||
|  |     val dataState = context.dataState.collectAsState() | ||||||
|  |     context.block(dataState.value) | ||||||
|  | } | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Composable function for managing an infinitely paged component. |  * Composable function for managing an infinitely paged component. | ||||||
|  * |  * | ||||||
| @@ -84,13 +122,8 @@ internal fun <T> InfinityPagedComponent( | |||||||
|     block: @Composable InfinityPagedComponentContext<T>.(List<T>?) -> Unit |     block: @Composable InfinityPagedComponentContext<T>.(List<T>?) -> Unit | ||||||
| ) { | ) { | ||||||
|     val scope = predefinedScope ?: rememberCoroutineScope() |     val scope = predefinedScope ?: rememberCoroutineScope() | ||||||
|     val context = remember { InfinityPagedComponentContext<T>(page, size, scope, loader) } |     val context = rememberInfinityPagedComponentContext(page = page, size = size, scope = scope, loader = loader) | ||||||
|     remember { |     InfinityPagedComponent(context, block) | ||||||
|         context.reload() |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     val dataState = context.dataState.collectAsState() |  | ||||||
|     context.block(dataState.value) |  | ||||||
| } | } | ||||||
|  |  | ||||||
| /** | /** | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								repos/cache/build.gradle
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								repos/cache/build.gradle
									
									
									
									
										vendored
									
									
								
							| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -19,6 +19,10 @@ kotlin { | |||||||
|         browser() |         browser() | ||||||
|         nodejs() |         nodejs() | ||||||
|     } |     } | ||||||
|  |     wasmJs { | ||||||
|  |         browser() | ||||||
|  |         nodejs() | ||||||
|  |     } | ||||||
|     androidTarget { |     androidTarget { | ||||||
|         compilations.all { |         compilations.all { | ||||||
|             kotlinOptions { |             kotlinOptions { | ||||||
|   | |||||||
| @@ -5,7 +5,7 @@ plugins { | |||||||
|     id "com.google.devtools.ksp" |     id "com.google.devtools.ksp" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user