mirror of
				https://github.com/InsanusMokrassar/MicroUtils.git
				synced 2025-10-31 12:10:29 +00:00 
			
		
		
		
	Compare commits
	
		
			306 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 496117d517 | |||
| 8ce7d37b72 | |||
| 46c89c48a9 | |||
| bad9a53fdb | |||
| 0bce7bd60a | |||
| 2f70a1cfb4 | |||
| bfb6e738ee | |||
| c7ad9aae07 | |||
| fecd719239 | |||
| 18d6ac31b5 | |||
| d8dbebfc7e | |||
| 16463d0eb9 | |||
| 837cac644d | |||
| e83e0a8535 | |||
| 2e309c31a6 | |||
| 625db02651 | |||
| e3144c08c1 | |||
| 40e25970ad | |||
| 4ccb8a8d11 | |||
| 26d1c3d9ef | |||
| cc8fe7b001 | |||
| 4601eab864 | |||
| 1ee9c88ffd | |||
| 7feac213f6 | |||
| c75a9c0f61 | |||
| afd0c9784f | |||
| f1ddbea06e | |||
| 42bf3cd4e3 | |||
| 27f5549f56 | |||
| b0569f8421 | |||
| 8d86f29325 | |||
| aeca32498a | |||
| e8232664f3 | |||
| efa869f91a | |||
| dbff3d7cf1 | |||
| 9e70f73684 | |||
| 9f2f0de0c4 | |||
| bf293a8f8f | |||
| 5fbc1a132f | |||
| 36093b9741 | |||
| 8713fb04c5 | |||
| ea82a59f31 | |||
| 18f67cd4f2 | |||
| 120e7228c7 | |||
| 892fa90c37 | |||
| 491dac5bf0 | |||
| 2ab06fbafd | |||
| e68735d061 | |||
| 9ba4d98c30 | |||
| 19bbfd4916 | |||
| d94cd7ea94 | |||
| 0dd8f41eb0 | |||
| f1ab5ab51f | |||
| a8056f3120 | |||
| 09c0cdebb5 | |||
| 629d7c7a82 | |||
| a0dd1aec3d | |||
| 17d6377902 | |||
| ad401105a1 | |||
| 4913e99c2e | |||
| 16b97029cf | |||
| 481130c9bb | |||
| 698ed6718d | |||
| d164813bb4 | |||
| 52157ee0e7 | |||
| 877b62fe5d | |||
| d823a02971 | |||
| e950056e3b | |||
| 70014ba233 | |||
| 4425f24a20 | |||
| 410964a44b | |||
| 30389e8536 | |||
| 5314833041 | |||
| 40f7cf7678 | |||
| 83a0b07062 | |||
| 1b4900d691 | |||
| f9795d53a0 | |||
| 2b9bb4f141 | |||
| 9196e4c367 | |||
| 374a5a1a37 | |||
| 827cf32c1b | |||
| 98ad6dbeb2 | |||
| 63c8f642ec | |||
| 3bfe64f797 | |||
| ec98029467 | |||
| ab58478686 | |||
| 90247667d1 | |||
| e661185534 | |||
| d73e4e8e1f | |||
| a6905e73cb | |||
| 93b054d55e | |||
| 5db4c5c717 | |||
| 5e04521929 | |||
| 30440b4ed1 | |||
| 09bb90604d | |||
| 4d55ec6f36 | |||
| f373524f34 | |||
| 0398a7bebd | |||
| fa8a5bcd97 | |||
| 758a92410b | |||
| 77f56c5dda | |||
| 72f2fe3cc3 | |||
| 7e0e520f03 | |||
| 92c4784e42 | |||
| a634229dc0 | |||
| de3f36ef2a | |||
| c623a265ee | |||
| e75125f6df | |||
| 4901a8844c | |||
| a1854b68d8 | |||
| aee4a6243b | |||
| 4c0cb73d69 | |||
| c6eab182f6 | |||
| 3e3fbd97eb | |||
| feb695caa7 | |||
| 1bd46d9651 | |||
| 32eabb6b36 | |||
| 9bfe6dc6d8 | |||
| 3f366aeea4 | |||
| 4338fd46f2 | |||
| 36974f5b49 | |||
| d48f767408 | |||
| bd2558e852 | |||
| 9f7c963cd5 | |||
| 2db0eadbfe | |||
| 580c7b8842 | |||
| 88fba347ea | |||
| c8c5255e62 | |||
| 01a1a2760a | |||
| 6d34df8d48 | |||
| b124ea65e1 | |||
| f3214347a9 | |||
| 6b8724b59f | |||
| ac3e378edf | |||
| 5d31fd1c91 | |||
| 046fe1ec08 | |||
| 721873c843 | |||
| f6ffbfc10a | |||
| 4e91649e0a | |||
| 4f7f8abec4 | |||
| 6370562dbc | |||
| 94e2e67522 | |||
| 1d8330015d | |||
| e5017b0258 | |||
| cd412ca31b | |||
| d2b6473095 | |||
| ab42507275 | |||
| dcef844e20 | |||
| 3244708c1b | |||
| 73ac1f1741 | |||
| f104e9f352 | |||
| 393c9a7d06 | |||
| ea497ea488 | |||
|  | 5add89cad0 | ||
| 2db447d2ef | |||
| 31c83813e6 | |||
| 27483a282d | |||
| 48b816aa22 | |||
| 0065f94f52 | |||
| ccc0002eb2 | |||
| 15a2eee141 | |||
| b9faac71e5 | |||
| 0a4465de33 | |||
| f9dfd09628 | |||
| 8638d7afce | |||
| 8311793a43 | |||
| 0d552cfcd2 | |||
| 4b0f20dbd1 | |||
| cf531c949d | |||
| ba5c5f17d5 | |||
| 35825ad9b7 | |||
| b1eb26a89e | |||
| c9d04b6698 | |||
| 496133e014 | |||
| f2857ee2be | |||
| 22541f2d5e | |||
| e235c52b6c | |||
| e89b8c72dd | |||
| a374e53a3a | |||
| afb066c4ee | |||
| f05761d4a5 | |||
| 76adc9ea33 | |||
| 99dd291413 | |||
| f904eb27e1 | |||
| eeb8214812 | |||
| f7215b039e | |||
| c07fe5a0f9 | |||
| 0d28cb6e20 | |||
| a1a17bfd1f | |||
| f386f09592 | |||
| a47e17fe6e | |||
| 01dc3b63ff | |||
| 2d97e0699e | |||
| 75f514d99b | |||
| 9a687cfc1c | |||
| 14edf8b6b7 | |||
| 23aa2d8917 | |||
| 7651388b5c | |||
| 805ab32b24 | |||
| cc623b1097 | |||
| 1420416b3e | |||
| 9a0b67f938 | |||
| 303e1e6281 | |||
| ff59b0cc9c | |||
| be5d2ee715 | |||
| 8dd2e3f6f9 | |||
| 2eedd196d2 | |||
| 759a3f2784 | |||
| 386fa830c3 | |||
| c382423d77 | |||
| bb466ce66c | |||
| 72cd3dd8a1 | |||
|  | 595cedaaf1 | ||
| eeaceb6cf5 | |||
| 1bd671685b | |||
| 48d3fe41f2 | |||
| 7ab21871cd | |||
| 65d01b1fb3 | |||
| 6230accb68 | |||
| c6ed821934 | |||
| 10e03bb951 | |||
| aa4f392948 | |||
| f51b59ec02 | |||
| 8c76834ae4 | |||
| 4a454f3d67 | |||
| 151aa1863d | |||
| 3bf6896296 | |||
| 0d01561476 | |||
| f6ded92251 | |||
| d01b735cc6 | |||
| 6c12001080 | |||
| 1afbf03606 | |||
| f6ef5c61c5 | |||
| c18fee8107 | |||
| d9df7a4384 | |||
| 87c2230e8e | |||
| da7eb6de0a | |||
| ed3815118f | |||
| be726f42bd | |||
| a91006132f | |||
| 9a9f741a0b | |||
| 5028f130e9 | |||
| 77fa019651 | |||
| 9715da9384 | |||
| f6d5035c1a | |||
| 43e782ab6f | |||
| f3f9920bfb | |||
| 2bfd615812 | |||
| ebfacb3659 | |||
| c71d557eec | |||
| e0398cef21 | |||
| f91599e9c6 | |||
| f8f9f93c97 | |||
| a8a5340d8b | |||
| 871b27f37d | |||
| 6f174cae1d | |||
| 22d7ac3e22 | |||
| 9b30c3a155 | |||
| 915bac64b1 | |||
| 9d2b50e55d | |||
| bde100f63d | |||
| 05b035a13d | |||
| eefb56bed7 | |||
| fcc0dc4189 | |||
| 47ff20317f | |||
| 1558b9103d | |||
| 7a78742162 | |||
| c01e240f66 | |||
| fef4fcbac6 | |||
| 5ab18bce4b | |||
| 24aec7271a | |||
| 9b19a2cb95 | |||
| efdd7b8a57 | |||
| 6df4cc9c3b | |||
| b9d93db0f5 | |||
| d7ee45ca64 | |||
| d7c31b1b22 | |||
| 7d6794a358 | |||
| 473eb87346 | |||
| 8b18b07790 | |||
| ab3c80a5ec | |||
| 075b93ecd6 | |||
| f6d0f72e49 | |||
| fcda3af862 | |||
| d5c7a589b1 | |||
| 86e099ed25 | |||
| ebd7befe73 | |||
| b8c7e581a1 | |||
| 8281259179 | |||
| d3e06b07df | |||
| 4967018418 | |||
| 537a3c38fa | |||
| 0124957833 | |||
| f0420e2d61 | |||
| 7090566041 | |||
| f0d5035cd0 | |||
| 0fb9b8dc30 | |||
| eef6e81134 | |||
| 1593159a3f | |||
| 3da9eb9dbe | |||
| f17613f3fb | |||
| 14337ccb46 | |||
| 1a3913b09c | |||
| 039aed2747 | |||
| 173991e3cb | |||
| 8b3f8cab01 | 
							
								
								
									
										2
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							| @@ -8,7 +8,7 @@ jobs: | |||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|       - uses: actions/setup-java@v1 |       - uses: actions/setup-java@v1 | ||||||
|         with: |         with: | ||||||
|           java-version: 11 |           java-version: 17 | ||||||
|       - name: Rewrite version |       - name: Rewrite version | ||||||
|         run: | |         run: | | ||||||
|           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`" |           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`" | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								.github/workflows/dokka_push.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/dokka_push.yml
									
									
									
									
										vendored
									
									
								
							| @@ -10,7 +10,7 @@ jobs: | |||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|       - uses: actions/setup-java@v1 |       - uses: actions/setup-java@v1 | ||||||
|         with: |         with: | ||||||
|           java-version: 11 |           java-version: 17 | ||||||
|       - name: Build |       - name: Build | ||||||
|         run: ./gradlew build && ./gradlew dokkaHtml |         run: ./gradlew build && ./gradlew dokkaHtml | ||||||
|       - name: Publish KDocs |       - name: Publish KDocs | ||||||
|   | |||||||
							
								
								
									
										7
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -1,4 +1,5 @@ | |||||||
| .idea | .idea | ||||||
|  | .kotlin | ||||||
| out/* | out/* | ||||||
| *.iml | *.iml | ||||||
| target | target | ||||||
| @@ -14,3 +15,9 @@ local.properties | |||||||
| kotlin-js-store | kotlin-js-store | ||||||
|  |  | ||||||
| publishing.sh | publishing.sh | ||||||
|  |  | ||||||
|  | local.* | ||||||
|  | local/ | ||||||
|  | **/*.local.* | ||||||
|  |  | ||||||
|  | .kotlin/ | ||||||
|   | |||||||
							
								
								
									
										464
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										464
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,469 @@ | |||||||
| # Changelog | # Changelog | ||||||
|  |  | ||||||
|  | ## 0.22.6 | ||||||
|  |  | ||||||
|  | * `KSP`: | ||||||
|  |   * `Generator`: | ||||||
|  |     * Add extension `KSClassDeclaration.buildSubFileName` | ||||||
|  |     * Add extension `KSClassDeclaration.companion` | ||||||
|  |     * Add extension `KSClassDeclaration.resolveSubclasses` | ||||||
|  |   * `Sealed`: | ||||||
|  |     * Improvements | ||||||
|  |  | ||||||
|  | ## 0.22.5 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |   * `Compose`: `1.7.0-beta02` -> `1.7.0-rc01` | ||||||
|  |   * `SQLite`: `3.46.1.2` -> `3.46.1.3` | ||||||
|  |   * `AndroidXFragment`: `1.8.3` -> `1.8.4` | ||||||
|  | * `Common`: | ||||||
|  |   * Add extension `withReplacedAt`/`withReplaced` ([#489](https://github.com/InsanusMokrassar/MicroUtils/issues/489)) | ||||||
|  | * `Coroutines`: | ||||||
|  |   * Add extension `Flow.debouncedBy` | ||||||
|  | * `Ktor`: | ||||||
|  |   * `Server`: | ||||||
|  |     * Add `KtorApplicationConfigurator.Routing.Static` as solution for [#488](https://github.com/InsanusMokrassar/MicroUtils/issues/488) | ||||||
|  |  | ||||||
|  | ## 0.22.4 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |   * `Exposed`: `0.54.0` -> `0.55.0` | ||||||
|  |   * `SQLite`: `3.46.1.0` -> `3.46.1.2` | ||||||
|  |  | ||||||
|  | ## 0.22.3 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |   * `Serialization`: `1.7.2` -> `1.7.3` | ||||||
|  |   * `Coroutines`: `1.8.1` -> `1.9.0` | ||||||
|  |   * `Compose`: `1.7.0-alpha03` -> `1.7.0-beta02` | ||||||
|  |   * `Koin`: `3.5.6` -> `4.0.0` | ||||||
|  |   * `Okio`: `3.9.0` -> `3.9.1` | ||||||
|  |   * `AndroidFragment`: `1.8.2` -> `1.8.3` | ||||||
|  |   * `androidx.compose.material3:material3` has been replaced with `org.jetbrains.compose.material3:material3` | ||||||
|  | * `Common`: | ||||||
|  |   * `JS`: | ||||||
|  |     * Add several useful extensions | ||||||
|  |   * `Compose`: | ||||||
|  |     * `JS`: | ||||||
|  |       * Add several useful extensions | ||||||
|  |  | ||||||
|  | ## 0.22.2 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Exposed`: `0.53.0` -> `0.54.0` | ||||||
|  |     * `SQLite`: `3.46.0.1` -> `3.46.1.0` | ||||||
|  |  | ||||||
|  | ## 0.22.1 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `2.0.10` -> `2.0.20` | ||||||
|  |     * `Serialization`: `1.7.1` -> `1.7.2` | ||||||
|  |     * `KSLog`: `1.3.5` -> `1.3.6` | ||||||
|  |     * `Compose`: `1.7.0-alpha02` -> `1.7.0-alpha03` | ||||||
|  |     * `Ktor`: `2.3.11` -> `2.3.12` | ||||||
|  |  | ||||||
|  | ## 0.22.0 | ||||||
|  |  | ||||||
|  | **THIS UPDATE CONTAINS BREAKING CHANGES ACCORDING TO UPDATE UP TO KOTLIN 2.0** | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.23` -> `2.0.10` | ||||||
|  |     * `Serialization`: `1.6.3` -> `1.7.1` | ||||||
|  |     * `KSLog`: `1.3.4` -> `1.3.5` | ||||||
|  |     * `Compose`: `1.6.2` -> `1.7.0-alpha02` | ||||||
|  |     * `Exposed`: `0.50.1` -> `0.53.0` | ||||||
|  |     * `AndroidAppCompat`: `1.6.1` -> `1.7.0` | ||||||
|  |     * `AndroidFragment`: `1.7.1` -> `1.8.2` | ||||||
|  |  | ||||||
|  | ## 0.21.6 | ||||||
|  |  | ||||||
|  | * `KSP`: | ||||||
|  |     * `Sealed`: | ||||||
|  |         * Fixes in generation | ||||||
|  |  | ||||||
|  | ## 0.21.5 | ||||||
|  |  | ||||||
|  | * `KSP`: | ||||||
|  |     * Add utility functions `KSClassDeclaration.findSubClasses` | ||||||
|  |     * `Sealed`: | ||||||
|  |         * Improve generation | ||||||
|  |  | ||||||
|  | ## 0.21.4 | ||||||
|  |  | ||||||
|  | * `Common`: | ||||||
|  |     * `Compose`: | ||||||
|  |         * Add support of mingw, linux, arm64 targets | ||||||
|  | * `Coroutines`: | ||||||
|  |     * `Compose`: | ||||||
|  |         * Add support of mingw, linux, arm64 targets | ||||||
|  | * `Koin`: | ||||||
|  |     * Add support of mingw, linux, arm64 targets | ||||||
|  | * `KSP`: | ||||||
|  |     * `ClassCasts`: | ||||||
|  |         * Add support of mingw, linux, arm64 targets | ||||||
|  |     * `Sealed`: | ||||||
|  |         * Add support of mingw, linux, arm64 targets | ||||||
|  |  | ||||||
|  | ## 0.21.3 | ||||||
|  |  | ||||||
|  | * `Colors`: | ||||||
|  |     * Added as a module. It should be used by default in case you wish all the API currently realized for `HEXAColor` | ||||||
|  | * `Coroutines`: | ||||||
|  |     * Fix of [#374](https://github.com/InsanusMokrassar/MicroUtils/issues/374): | ||||||
|  |         * Add vararg variants of `awaitFirst` | ||||||
|  |         * Add `joinFirst` | ||||||
|  |  | ||||||
|  | ## 0.21.2 | ||||||
|  |  | ||||||
|  | * `KSP`: | ||||||
|  |     * `ClassCasts`: | ||||||
|  |         * Module has been initialized | ||||||
|  |  | ||||||
|  | ## 0.21.1 | ||||||
|  |  | ||||||
|  | * `KSP`: | ||||||
|  |     * Module has been initialized | ||||||
|  |     * `Generator`: | ||||||
|  |         * Module has been initialized | ||||||
|  |     * `Sealed`: | ||||||
|  |         * Module has been initialized | ||||||
|  |  | ||||||
|  | ## 0.21.0 | ||||||
|  |  | ||||||
|  | **THIS UPDATE CONTAINS BREAKING CHANGES IN `safely*`-ORIENTED FUNCTIONS** | ||||||
|  |  | ||||||
|  | * `Coroutines`: | ||||||
|  |     * **All `safely` functions lost their `supervisorScope` in favor to wrapping `runCatching`** | ||||||
|  |         * `runCatchingSafely` is the main handling function of all `safely` functions | ||||||
|  |         * `launchSafely*` and `asyncSafely*` blocks lost `CoroutineScope` as their receiver | ||||||
|  |  | ||||||
|  | ## 0.20.52 | ||||||
|  |  | ||||||
|  | * `Coroutines`: | ||||||
|  |     * Small rework of weak jobs: add `WeakScope` factory, rename old weal extensions and add kdocs | ||||||
|  |  | ||||||
|  | ## 0.20.51 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Android Fragment`: `1.7.0` -> `1.7.1` | ||||||
|  | * `Pagination`: | ||||||
|  |     * Add `Pagination.nextPageIfTrue` and `Pagination.thisPageIftrue` extensions to get the page according to condition | ||||||
|  |     pass status | ||||||
|  |     * Add `PaginationResult.nextPageIfNotEmptyOrLastPage` and `PaginationResult.thisPageIfNotEmptyOrLastPage` | ||||||
|  |     * Change all `doForAll` and `getAll` extensions fo pagination to work basing on `nextPageIfNotEmptyOrLastPage` and | ||||||
|  |     `thisPageIfNotEmptyOrLastPage` | ||||||
|  |  | ||||||
|  | ## 0.20.50 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Coroutines`: `1.8.0` -> `1.8.1` | ||||||
|  |     * `KSLog`: `1.3.3` -> `1.3.4` | ||||||
|  |     * `Exposed`: `0.50.0` -> `0.50.1` | ||||||
|  |     * `Ktor`: `2.3.10` -> `2.3.11` | ||||||
|  | * A lot of inline functions became common functions due to inline with only noinline callbacks in arguments leads to | ||||||
|  | low performance | ||||||
|  | * `Coroutines`: | ||||||
|  |     * `SmartMutex`, `SmartSemaphore` and `SmartRWLocker` as their user changed their state flow to `SpecialMutableStateFlow` | ||||||
|  |  | ||||||
|  | ## 0.20.49 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Common`: | ||||||
|  |         * All `Repo`s get `diff` extensions | ||||||
|  |         * `KeyValueRepo` and `KeyValuesRepo` get `applyDiff` extension | ||||||
|  |         * Add new extensions `on*` flows for crud repos | ||||||
|  |  | ||||||
|  | ## 0.20.48 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Android Core KTX`: `1.13.0` -> `1.13.1` | ||||||
|  |     * `AndroidX Fragment`: `1.6.2` -> `1.7.0` | ||||||
|  |  | ||||||
|  | ## 0.20.47 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Exposed`: `0.49.0` -> `0.50.0` | ||||||
|  |  | ||||||
|  | ## 0.20.46 | ||||||
|  |  | ||||||
|  | * `Common`: | ||||||
|  |     * Now this repo depends on `klock` | ||||||
|  |     * Add new object-serializer `DateTimeSerializer` for `klock` serializer | ||||||
|  |  | ||||||
|  | ## 0.20.45 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Android Core KTX`: `1.12.0` -> `1.13.0` | ||||||
|  |  | ||||||
|  | ## 0.20.44 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Compose`: `1.6.1` -> `1.6.2` | ||||||
|  |     * `Koin`: `3.5.4` -> `3.5.6` | ||||||
|  |  | ||||||
|  | ## 0.20.43 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.3.9` -> `2.3.10` | ||||||
|  |     * `Koin`: `3.5.3` -> `3.5.4` | ||||||
|  |  | ||||||
|  | ## 0.20.42 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Generator`: | ||||||
|  |         * Improvements | ||||||
|  |  | ||||||
|  | ## 0.20.41 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Exposed`: | ||||||
|  |         * `AbstractExposedKeyValueRepo`, `ExposedKeyValueRepo`, `AbstractExposedKeyValuesRepo`, `ExposedKeyValuesRepo` got opportunity to setup some part of their flows | ||||||
|  |  | ||||||
|  | ## 0.20.40 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `KSLog`: `1.3.2` -> `1.3.3` | ||||||
|  |     * `Exposed`: `0.48.0` -> `0.49.0` | ||||||
|  |     * `UUID`: `0.8.2` -> `0.8.4` | ||||||
|  |  | ||||||
|  | ## 0.20.39 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.22` -> `1.9.23` | ||||||
|  |     * `Korlibs`: `5.3.2` -> `5.4.0` | ||||||
|  |     * `Okio`: `3.8.0` -> `3.9.0` | ||||||
|  |     * `Compose`: `1.6.0` -> `1.6.1` | ||||||
|  |     * `ComposeMaterial3`: `1.2.0` -> `1.2.1` | ||||||
|  |  | ||||||
|  | ## 0.20.38 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.3.8` -> `2.3.9` | ||||||
|  |  | ||||||
|  | ## 0.20.37 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Compose`: `1.5.12` -> `1.6.0` | ||||||
|  |     * `Exposed`: `0.47.0` -> `0.48.0` | ||||||
|  |  | ||||||
|  | ## 0.20.36 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Serialization`: `1.6.2` -> `1.6.3` | ||||||
|  |     * `Korlibs`: `5.3.1` -> `5.3.2` | ||||||
|  | * `Repos`: | ||||||
|  |     * `Cache`: | ||||||
|  |         * Improve work and functionality of `actualizeAll` and subsequent functions | ||||||
|  |         * All internal repos `invalidate`/`actualizeAll` now use common `actualizeAll` functions | ||||||
|  |  | ||||||
|  | ## 0.20.35 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Coroutines`: `1.7.3` -> `1.8.0` | ||||||
|  |     * `Material3`: `1.1.2` -> `1.2.0` | ||||||
|  |  | ||||||
|  | ## 0.20.34 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Common`: | ||||||
|  |         * Improve default `set` realization of `KeyValuesRepo` | ||||||
|  |  | ||||||
|  | ## 0.20.33 | ||||||
|  |  | ||||||
|  | * `Colors` | ||||||
|  |     * `Common`: | ||||||
|  |         * Add opportunity to use `HEXAColor` with `ahex` colors | ||||||
|  |  | ||||||
|  | ## 0.20.32 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Okio`: `3.7.0` -> `3.8.0` | ||||||
|  | * `Resources`: | ||||||
|  |     * Make `StringResource` serializable | ||||||
|  |     * Add several variants of builder usages | ||||||
|  |  | ||||||
|  | ## 0.20.31 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.3.7` -> `2.3.8` | ||||||
|  |  | ||||||
|  | ## 0.20.30 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Exposed`: `0.46.0` -> `0.47.0` | ||||||
|  |  | ||||||
|  | ## 0.20.29 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.21` -> `1.9.22` | ||||||
|  |     * `Compose`: `1.5.11` -> `1.5.12` | ||||||
|  |     * `Korlibs`: `5.3.0` -> `5.3.1` | ||||||
|  |  | ||||||
|  | ## 0.20.28 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.22` -> `1.9.21` (downgrade) | ||||||
|  |     * `Compose`: `1.6.0-dev13691` -> `1.5.11` (downgrade) | ||||||
|  |  | ||||||
|  | ## 0.20.27 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.21` -> `1.9.22` | ||||||
|  |     * `Compose`: `1.5.11` -> `1.6.0-dev13691` | ||||||
|  |  | ||||||
|  | ## 0.20.26 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Exposed`: `0.45.0` -> `0.46.0`. **This update brinds new api deprecations in exposed** | ||||||
|  | * `Resources`: | ||||||
|  |     * Add opportunity to get default translation by passing `null` as `IetfLang` argument | ||||||
|  |     * Add several useful extensions to get translations in `JS` target | ||||||
|  |  | ||||||
|  | ## 0.20.25 | ||||||
|  |  | ||||||
|  | * `Colors`: | ||||||
|  |     * `Common`: | ||||||
|  |         * Module inited | ||||||
|  |  | ||||||
|  | ## 0.20.24 | ||||||
|  |  | ||||||
|  | **Since this version depdendencies of klock and krypto replaced with `com.soywiz.korge:korlibs-time` and `com.soywiz.korge:korlibs-crypto`** | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Klock` (since now `KorlibsTime`): `4.0.10` -> `5.3.0` | ||||||
|  |     * `Krypto` (since now `KorlibsCrypto`): `4.0.10` -> `5.3.0` | ||||||
|  | * `Serialization`: | ||||||
|  |     * `Mapper`: | ||||||
|  |         * `Mapper` pass decoder into callback of deserialization strategy | ||||||
|  |         * `Mapper` pass encoder into callback of serialization strategy | ||||||
|  |  | ||||||
|  | ## 0.20.23 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Koin`: `3.5.0` -> `3.5.3` | ||||||
|  |     * `Okio`: `3.6.0` -> `3.7.0` | ||||||
|  | * `LanguageCodes`: | ||||||
|  |     * Fixes in intermediate language codes (like `Chinese.Hans`) | ||||||
|  |     * Rename `IetfLanguageCode` to `IetfLang` | ||||||
|  |         * Rename all subsequent functions (including serializer) | ||||||
|  |     * New lazy properties `knownLanguageCodesMap`, `knownLanguageCodesMapByLowerCasedKeys` and several others | ||||||
|  |  | ||||||
|  | ## 0.20.22 | ||||||
|  |  | ||||||
|  | * `Common`: | ||||||
|  |     * Add opportunity to create own `Diff` with base constructor | ||||||
|  |  | ||||||
|  | ## 0.20.21 | ||||||
|  |  | ||||||
|  | * `Resources`: | ||||||
|  |     * Inited | ||||||
|  |  | ||||||
|  | ## 0.20.20 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Exposed`: | ||||||
|  |         * Add opportunity for setup flows in `AbstractExposedCRUDRepo` | ||||||
|  |  | ||||||
|  | ## 0.20.19 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.3.6` -> `2.3.7` | ||||||
|  |  | ||||||
|  | ## 0.20.18 | ||||||
|  |  | ||||||
|  | * `Coroutines`: | ||||||
|  |     * `SpecialMutableStateFlow` now extends `MutableStateFlow` | ||||||
|  |     * `Compose`: | ||||||
|  |         * Deprecate `FlowState` due to its complexity in fixes | ||||||
|  |  | ||||||
|  | ## 0.20.17 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Serialization`: `1.6.1` -> `1.6.2` | ||||||
|  |  | ||||||
|  | ## 0.20.16 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Exposed`: `0.44.1` -> `0.45.0` | ||||||
|  | * `Coroutines`: | ||||||
|  |     * Add `SpecialMutableStateFlow` | ||||||
|  |     * `Compose`: | ||||||
|  |         * Add `FlowState` | ||||||
|  |  | ||||||
|  | ## 0.20.15 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.20` -> `1.9.21` | ||||||
|  |     * `KSLog`: `1.3.0` -> `1.3.1` | ||||||
|  |     * `Compose`: `1.5.10` -> `1.5.11` | ||||||
|  |  | ||||||
|  | ## 0.20.14 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Serialization`: `1.6.0` -> `1.6.1` | ||||||
|  |     * `KSLog`: `1.2.4` -> `1.3.0` | ||||||
|  |  | ||||||
|  | ## 0.20.13 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.3.5` -> `2.3.6` | ||||||
|  |     * `UUID`: `0.8.1` -> `0.8.2` | ||||||
|  |  | ||||||
|  | ## 0.20.12 | ||||||
|  |  | ||||||
|  | **It is experimental migration onto new gradle version. Be careful in use of this version** | ||||||
|  |  | ||||||
|  | **This update have JDK 17 in `compatibility` and `target` versions** | ||||||
|  |  | ||||||
|  | ## 0.20.11 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.20-RC2` -> `1.9.20` | ||||||
|  |     * `Exposed`: `0.44.0` -> `0.44.1` | ||||||
|  |     * `Compose`: `1.5.10-rc02` -> `1.5.10` | ||||||
|  | * `Coroutines`: | ||||||
|  |     * `SmartRWLocker` now will wait first unlock of write mutex for acquiring read | ||||||
|  |  | ||||||
|  | ## 0.20.10 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.20-RC` -> `1.9.20-RC1` | ||||||
|  |     * `KSLog`: `1.2.1` -> `1.2.2` | ||||||
|  |     * `Compose`: `1.5.10-rc01` -> `1.5.10-rc02` | ||||||
|  |     * `RecyclerView`: `1.3.1` -> `1.3.2` | ||||||
|  |  | ||||||
|  | ## 0.20.9 | ||||||
|  |  | ||||||
|  | * Most of common modules now supports `linuxArm64` target | ||||||
|  |  | ||||||
|  | ## 0.20.8 | ||||||
|  |  | ||||||
|  | **THIS VERSION CONTAINS UPDATES OF DEPENDENCIES UP TO RC VERSIONS. USE WITH CAUTION** | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.20-Beta2` -> `1.9.20-RC` | ||||||
|  |     * `Compose`: `1.5.10-beta02` -> `1.5.10-rc01` | ||||||
|  |  | ||||||
|  | ## 0.20.7 | ||||||
|  |  | ||||||
|  | **THIS VERSION CONTAINS UPDATES OF DEPENDENCIES UP TO BETA VERSIONS. USE WITH CAUTION** | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.10` -> `1.9.20-Beta2` | ||||||
|  |     * `Compose`: `1.5.1` -> `1.5.10-beta02` | ||||||
|  |     * `Exposed`: `0.43.0` -> `0.44.0` | ||||||
|  |     * `Ktor`: `2.3.4` -> `2.3.5` | ||||||
|  |     * `Koin`: `3.4.3` -> `3.5.0` | ||||||
|  |     * `Okio`: `3.5.0` -> `3.6.0` | ||||||
|  |     * `Android Core`: `1.10.1` -> `1.12.0` | ||||||
|  |     * `Android Compose Material`: `1.1.1` -> `1.1.2` | ||||||
|  |  | ||||||
|  | ## 0.20.6 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Exposed` | ||||||
|  |         * Fixes in exposed key-values repos | ||||||
|  |  | ||||||
| ## 0.20.5 | ## 0.20.5 | ||||||
|  |  | ||||||
| * `Coroutines`: | * `Coroutines`: | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppAndroidProjectPresetPath" | apply from: "$mppAndroidProject" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppAndroidProjectPresetPath" | apply from: "$mppAndroidProject" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -3,9 +3,10 @@ plugins { | |||||||
|     id "org.jetbrains.kotlin.plugin.serialization" |     id "org.jetbrains.kotlin.plugin.serialization" | ||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
|     alias(libs.plugins.jb.compose) |     alias(libs.plugins.jb.compose) | ||||||
|  |     alias(libs.plugins.kt.jb.compose) | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppProjectWithSerializationAndComposePresetPath" | apply from: "$mppProjectWithSerializationAndCompose" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -7,9 +7,6 @@ import androidx.compose.foundation.gestures.* | |||||||
| import androidx.compose.foundation.layout.* | import androidx.compose.foundation.layout.* | ||||||
| import androidx.compose.foundation.text.KeyboardActions | import androidx.compose.foundation.text.KeyboardActions | ||||||
| import androidx.compose.foundation.text.KeyboardOptions | import androidx.compose.foundation.text.KeyboardOptions | ||||||
| import androidx.compose.material.ContentAlpha |  | ||||||
| import androidx.compose.material.IconButton |  | ||||||
| import androidx.compose.material.ProvideTextStyle |  | ||||||
| import androidx.compose.material.icons.Icons | import androidx.compose.material.icons.Icons | ||||||
| import androidx.compose.material.icons.filled.KeyboardArrowDown | import androidx.compose.material.icons.filled.KeyboardArrowDown | ||||||
| import androidx.compose.material.icons.filled.KeyboardArrowUp | import androidx.compose.material.icons.filled.KeyboardArrowUp | ||||||
| @@ -75,7 +72,7 @@ fun NumberPicker( | |||||||
|     } |     } | ||||||
|     val coercedAnimatedOffset = animatedOffset.value % halvedNumbersColumnHeightPx |     val coercedAnimatedOffset = animatedOffset.value % halvedNumbersColumnHeightPx | ||||||
|     val animatedStateValue = animatedStateValue(animatedOffset.value) |     val animatedStateValue = animatedStateValue(animatedOffset.value) | ||||||
|     val disabledArrowsColor = arrowsColor.copy(alpha = ContentAlpha.disabled) |     val disabledArrowsColor = arrowsColor.copy(alpha = 0f) | ||||||
|  |  | ||||||
|     val inputFieldShown = if (allowUseManualInput) { |     val inputFieldShown = if (allowUseManualInput) { | ||||||
|         remember { mutableStateOf(false) } |         remember { mutableStateOf(false) } | ||||||
|   | |||||||
| @@ -5,7 +5,6 @@ import androidx.compose.animation.core.exponentialDecay | |||||||
| import androidx.compose.foundation.gestures.* | import androidx.compose.foundation.gestures.* | ||||||
| import androidx.compose.foundation.layout.* | import androidx.compose.foundation.layout.* | ||||||
| import androidx.compose.foundation.rememberScrollState | import androidx.compose.foundation.rememberScrollState | ||||||
| import androidx.compose.material.ContentAlpha |  | ||||||
| import androidx.compose.material.icons.Icons | import androidx.compose.material.icons.Icons | ||||||
| import androidx.compose.material.icons.filled.KeyboardArrowDown | import androidx.compose.material.icons.filled.KeyboardArrowDown | ||||||
| import androidx.compose.material.icons.filled.KeyboardArrowUp | import androidx.compose.material.icons.filled.KeyboardArrowUp | ||||||
| @@ -62,9 +61,7 @@ fun <T> SetPicker( | |||||||
|         (index - ceil(animatedOffset.value / halvedNumbersColumnHeightPx).toInt()) |         (index - ceil(animatedOffset.value / halvedNumbersColumnHeightPx).toInt()) | ||||||
|     } |     } | ||||||
|     val coercedAnimatedOffset = animatedOffset.value % halvedNumbersColumnHeightPx |     val coercedAnimatedOffset = animatedOffset.value % halvedNumbersColumnHeightPx | ||||||
|     val boxOffset = (indexAnimatedOffset * halvedNumbersColumnHeightPx) - coercedAnimatedOffset |     val disabledArrowsColor = arrowsColor.copy(alpha = 0f) | ||||||
|     val disabledArrowsColor = arrowsColor.copy(alpha = ContentAlpha.disabled) |  | ||||||
|     val scrollState = rememberScrollState() |  | ||||||
|  |  | ||||||
|     Column( |     Column( | ||||||
|         modifier = modifier |         modifier = modifier | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppAndroidProjectPresetPath" | apply from: "$mppAndroidProject" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -3,15 +3,16 @@ plugins { | |||||||
|     id "org.jetbrains.kotlin.plugin.serialization" |     id "org.jetbrains.kotlin.plugin.serialization" | ||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
|     alias(libs.plugins.jb.compose) |     alias(libs.plugins.jb.compose) | ||||||
|  |     alias(libs.plugins.kt.jb.compose) | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppProjectWithSerializationAndComposePresetPath" | apply from: "$mppProjectWithSerializationAndCompose" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|         androidMain { |         androidMain { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 api libs.android.compose.material3 |                 api libs.jb.compose.material3 | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|   | |||||||
							
								
								
									
										11
									
								
								build.gradle
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								build.gradle
									
									
									
									
									
								
							| @@ -27,16 +27,7 @@ allprojects { | |||||||
|         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://git.inmo.dev/api/packages/InsanusMokrassar/maven" } |         maven { url "https://nexus.inmo.dev/repository/maven-releases/" } | ||||||
|     } |  | ||||||
|  |  | ||||||
|     // temporal crutch until legacy tests will be stabled or legacy target will be removed |  | ||||||
|     if (it != rootProject.findProject("docs")) { |  | ||||||
|         tasks.whenTaskAdded { task -> |  | ||||||
|             if(task.name == "jsLegacyBrowserTest" || task.name == "jsLegacyNodeTest") { |  | ||||||
|                 task.enabled = false |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										17
									
								
								colors/build.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								colors/build.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,17 @@ | |||||||
|  | plugins { | ||||||
|  |     id "org.jetbrains.kotlin.multiplatform" | ||||||
|  |     id "org.jetbrains.kotlin.plugin.serialization" | ||||||
|  |     id "com.android.library" | ||||||
|  | } | ||||||
|  |  | ||||||
|  | apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         commonMain { | ||||||
|  |             dependencies { | ||||||
|  |                 api project(":micro_utils.colors.common") | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										7
									
								
								colors/common/build.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								colors/common/build.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,7 @@ | |||||||
|  | plugins { | ||||||
|  |     id "org.jetbrains.kotlin.multiplatform" | ||||||
|  |     id "org.jetbrains.kotlin.plugin.serialization" | ||||||
|  |     id "com.android.library" | ||||||
|  | } | ||||||
|  |  | ||||||
|  | apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
							
								
								
									
										174
									
								
								colors/common/src/commonMain/kotlin/HEXAColor.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										174
									
								
								colors/common/src/commonMain/kotlin/HEXAColor.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,174 @@ | |||||||
|  | package dev.inmo.micro_utils.colors.common | ||||||
|  |  | ||||||
|  | import kotlinx.serialization.Serializable | ||||||
|  | import kotlin.jvm.JvmInline | ||||||
|  | import kotlin.math.floor | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Wrapper for RGBA colors. Receiving [UInt] in main constructor. Each part in main constructor | ||||||
|  |  * configured with `0x00 - 0xff` range. Examples: | ||||||
|  |  * | ||||||
|  |  * * Red: `0xff0000ffu` | ||||||
|  |  * * Red (0.5 capacity): `0xff000088u` | ||||||
|  |  * | ||||||
|  |  * Anyway it is recommended to use | ||||||
|  |  * | ||||||
|  |  * @param hexaUInt rgba [UInt] in format `0xFFEEBBAA` where FF - red, EE - green, BB - blue` and AA - alpha | ||||||
|  |  */ | ||||||
|  | @Serializable | ||||||
|  | @JvmInline | ||||||
|  | value class HEXAColor ( | ||||||
|  |     val hexaUInt: UInt | ||||||
|  | ) : Comparable<HEXAColor> { | ||||||
|  |     /** | ||||||
|  |      * @returns [hexaUInt] as a string with format `#FFEEBBAA` where FF - red, EE - green, BB - blue and AA - alpha | ||||||
|  |      */ | ||||||
|  |     val hexa: String | ||||||
|  |         get() = "#${hexaUInt.toString(16).padStart(8, '0')}" | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @returns [hexaUInt] as a string with format `#FFEEBB` where FF - red, EE - green and BB - blue | ||||||
|  |      */ | ||||||
|  |     val hex: String | ||||||
|  |         get() = hexa.take(7) | ||||||
|  |     /** | ||||||
|  |      * @returns [hexaUInt] as a string with format `#AAFFEEBB` where AA - alpha, FF - red, EE - green and BB - blue | ||||||
|  |      */ | ||||||
|  |     val ahex: String | ||||||
|  |         get() = "#${a.toString(16).padStart(2, '2')}${hex.drop(1)}" | ||||||
|  |     val rgba: String | ||||||
|  |         get() = "rgba($r,$g,$b,${aOfOne.toString().take(5)})" | ||||||
|  |     val rgb: String | ||||||
|  |         get() = "rgb($r,$g,$b)" | ||||||
|  |     val shortHex: String | ||||||
|  |         get() = "#${r.shortPart()}${g.shortPart()}${b.shortPart()}" | ||||||
|  |     val shortHexa: String | ||||||
|  |         get() = "$shortHex${a.shortPart()}" | ||||||
|  |     val rgbUInt: UInt | ||||||
|  |         get() = (hexaUInt / 256u) | ||||||
|  |     val rgbInt: Int | ||||||
|  |         get() = rgbUInt.toInt() | ||||||
|  |     val ahexUInt | ||||||
|  |         get() = (a * 0x1000000).toUInt() + rgbUInt | ||||||
|  |  | ||||||
|  |     val r: Int | ||||||
|  |         get() = ((hexaUInt and 0xff000000u) / 0x1000000u).toInt() | ||||||
|  |     val g: Int | ||||||
|  |         get() = ((hexaUInt and 0x00ff0000u) / 0x10000u).toInt() | ||||||
|  |     val b: Int | ||||||
|  |         get() = ((hexaUInt and 0x0000ff00u) / 0x100u).toInt() | ||||||
|  |     val a: Int | ||||||
|  |         get() = ((hexaUInt and 0x000000ffu)).toInt() | ||||||
|  |     val aOfOne: Float | ||||||
|  |         get() = a.toFloat() / (0xff) | ||||||
|  |     init { | ||||||
|  |         require(hexaUInt in 0u ..0xffffffffu) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     constructor(r: Int, g: Int, b: Int, a: Int) : this( | ||||||
|  |         ((r * 0x1000000).toLong() + g * 0x10000 + b * 0x100 + a).toUInt() | ||||||
|  |     ) { | ||||||
|  |         require(r in 0 ..0xff) | ||||||
|  |         require(g in 0 ..0xff) | ||||||
|  |         require(b in 0 ..0xff) | ||||||
|  |         require(a in 0 ..0xff) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     constructor(r: Int, g: Int, b: Int, aOfOne: Float = 1f) : this( | ||||||
|  |         r = r, g = g, b = b, a = (aOfOne * 0xff).toInt() | ||||||
|  |     ) | ||||||
|  |  | ||||||
|  |     override fun toString(): String { | ||||||
|  |         return hexa | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override fun compareTo(other: HEXAColor): Int = (hexaUInt - other.hexaUInt).coerceIn(Int.MIN_VALUE.toUInt(), Int.MAX_VALUE.toLong().toUInt()).toInt() | ||||||
|  |  | ||||||
|  |     fun copy( | ||||||
|  |         r: Int = this.r, | ||||||
|  |         g: Int = this.g, | ||||||
|  |         b: Int = this.b, | ||||||
|  |         aOfOne: Float = this.aOfOne | ||||||
|  |     ) = HEXAColor(r = r, g = g, b = b, aOfOne = aOfOne) | ||||||
|  |     fun copy( | ||||||
|  |         r: Int = this.r, | ||||||
|  |         g: Int = this.g, | ||||||
|  |         b: Int = this.b, | ||||||
|  |         a: Int | ||||||
|  |     ) = HEXAColor(r = r, g = g, b = b, a = a) | ||||||
|  |  | ||||||
|  |     companion object { | ||||||
|  |         /** | ||||||
|  |          * Parsing color from [color] | ||||||
|  |          * | ||||||
|  |          * Supported formats samples (on Red color based): | ||||||
|  |          * | ||||||
|  |          * * `#f00` | ||||||
|  |          * * `#f00f` | ||||||
|  |          * * `#ff0000` | ||||||
|  |          * * `#ff0000ff` | ||||||
|  |          * * `rgb(255, 0, 0)` | ||||||
|  |          * * `rgba(255, 0, 0, 1)` | ||||||
|  |          */ | ||||||
|  |         fun parseStringColor(color: String): HEXAColor = when { | ||||||
|  |             color.startsWith("#") -> color.removePrefix("#").let { color -> | ||||||
|  |                 when (color.length) { | ||||||
|  |                     3 -> color.map { "$it$it" }.joinToString(separator = "", postfix = "ff") | ||||||
|  |                     4 -> color.take(3).map { "$it$it" }.joinToString(separator = "", postfix = color.takeLast(1).let { "${it}0" }) | ||||||
|  |                     6 -> "${color}ff" | ||||||
|  |                     8 -> color | ||||||
|  |                     else -> error("Malfurmed color string: $color. It is expected that color started with # will contains 3, 6 or 8 valuable parts") | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             color.startsWith("rgb(") -> color | ||||||
|  |                 .removePrefix("rgb(") | ||||||
|  |                 .removeSuffix(")") | ||||||
|  |                 .replace(Regex("\\s"), "") | ||||||
|  |                 .split(",") | ||||||
|  |                 .joinToString("", postfix = "ff") { | ||||||
|  |                     it.toInt().toString(16).padStart(2, '0') | ||||||
|  |                 } | ||||||
|  |             color.startsWith("rgba(") -> color | ||||||
|  |                 .removePrefix("rgba(") | ||||||
|  |                 .removeSuffix(")") | ||||||
|  |                 .replace(Regex("\\s"), "") | ||||||
|  |                 .split(",").let { | ||||||
|  |                     it.take(3).map { it.toInt().toString(16).padStart(2, '0') } + (it.last().toFloat() * 0xff).toInt().toString(16).padStart(2, '0') | ||||||
|  |                 } | ||||||
|  |                 .joinToString("") | ||||||
|  |             else -> color | ||||||
|  |         }.lowercase().toUInt(16).let(::HEXAColor) | ||||||
|  |  | ||||||
|  |         /** | ||||||
|  |          * Creates [HEXAColor] from [uint] presume it is in format `0xFFEEBBAA` where FF - red, EE - green, BB - blue` and AA - alpha | ||||||
|  |          */ | ||||||
|  |         fun fromHexa(uint: UInt) = HEXAColor(uint) | ||||||
|  |  | ||||||
|  |         /** | ||||||
|  |          * Creates [HEXAColor] from [uint] presume it is in format `0xAAFFEEBB` where AA - alpha, FF - red, EE - green and BB - blue` | ||||||
|  |          */ | ||||||
|  |         fun fromAhex(uint: UInt) = HEXAColor( | ||||||
|  |             a = ((uint and 0xff000000u) / 0x1000000u).toInt(), | ||||||
|  |             r = ((uint and 0x00ff0000u) / 0x10000u).toInt(), | ||||||
|  |             g = ((uint and 0x0000ff00u) / 0x100u).toInt(), | ||||||
|  |             b = ((uint and 0x000000ffu)).toInt() | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |         /** | ||||||
|  |          * Parsing color from [color] | ||||||
|  |          * | ||||||
|  |          * Supported formats samples (on Red color based): | ||||||
|  |          * | ||||||
|  |          * * `#f00` | ||||||
|  |          * * `#ff0000` | ||||||
|  |          * * `#ff0000ff` | ||||||
|  |          * * `rgb(255, 0, 0)` | ||||||
|  |          * * `rgba(255, 0, 0, 1)` | ||||||
|  |          */ | ||||||
|  |         operator fun invoke(color: String) = parseStringColor(color) | ||||||
|  |  | ||||||
|  |         private fun Int.shortPart(): String { | ||||||
|  |             return (floor(toFloat() / 16)).toInt().toString(16) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										209
									
								
								colors/common/src/commonTest/kotlin/HexColorTests.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										209
									
								
								colors/common/src/commonTest/kotlin/HexColorTests.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,209 @@ | |||||||
|  | package dev.inmo.micro_utils.colors.common | ||||||
|  |  | ||||||
|  | import kotlin.math.floor | ||||||
|  | import kotlin.test.Test | ||||||
|  | import kotlin.test.assertEquals | ||||||
|  | import kotlin.test.assertTrue | ||||||
|  |  | ||||||
|  | class HexColorTests { | ||||||
|  |     val alphaRgbaPrecision = 5 | ||||||
|  |     class TestColor( | ||||||
|  |         val color: HEXAColor, | ||||||
|  |         val shortHex: String, | ||||||
|  |         val shortHexa: String, | ||||||
|  |         val hex: String, | ||||||
|  |         val hexa: String, | ||||||
|  |         val ahex: String, | ||||||
|  |         val ahexUInt: UInt, | ||||||
|  |         val rgbUInt: UInt, | ||||||
|  |         val rgb: String, | ||||||
|  |         val rgba: String, | ||||||
|  |         val r: Int, | ||||||
|  |         val g: Int, | ||||||
|  |         val b: Int, | ||||||
|  |         val a: Int, | ||||||
|  |         vararg val additionalRGBAVariants: String | ||||||
|  |     ) | ||||||
|  |     val testColors: List<TestColor> | ||||||
|  |         get() = listOf( | ||||||
|  |             TestColor( | ||||||
|  |                 color = HEXAColor(hexaUInt = 0xff0000ffu), | ||||||
|  |                 shortHex = "#f00", | ||||||
|  |                 shortHexa = "#f00f", | ||||||
|  |                 hex = "#ff0000", | ||||||
|  |                 hexa = "#ff0000ff", | ||||||
|  |                 ahex = "#ffff0000", | ||||||
|  |                 ahexUInt = 0xffff0000u, | ||||||
|  |                 rgbUInt = 0xff0000u, | ||||||
|  |                 rgb = "rgb(255,0,0)", | ||||||
|  |                 rgba = "rgba(255,0,0,1.0)", | ||||||
|  |                 r = 0xff, | ||||||
|  |                 g = 0x00, | ||||||
|  |                 b = 0x00, | ||||||
|  |                 a = 0xff, | ||||||
|  |                 "rgba(255,0,0,1)", | ||||||
|  |             ), | ||||||
|  |             TestColor( | ||||||
|  |                 color = HEXAColor(hexaUInt = 0x00ff00ffu), | ||||||
|  |                 shortHex = "#0f0", | ||||||
|  |                 shortHexa = "#0f0f", | ||||||
|  |                 hex = "#00ff00", | ||||||
|  |                 hexa = "#00ff00ff", | ||||||
|  |                 ahex = "#ff00ff00", | ||||||
|  |                 ahexUInt = 0xff00ff00u, | ||||||
|  |                 rgbUInt = 0x00ff00u, | ||||||
|  |                 rgb = "rgb(0,255,0)", | ||||||
|  |                 rgba = "rgba(0,255,0,1.0)", | ||||||
|  |                 r = 0x00, | ||||||
|  |                 g = 0xff, | ||||||
|  |                 b = 0x00, | ||||||
|  |                 a = 0xff, | ||||||
|  |                 "rgba(0,255,0,1)" | ||||||
|  |             ), | ||||||
|  |             TestColor( | ||||||
|  |                 color = HEXAColor(0x0000ffffu), | ||||||
|  |                 shortHex = "#00f", | ||||||
|  |                 shortHexa = "#00ff", | ||||||
|  |                 hex = "#0000ff", | ||||||
|  |                 hexa = "#0000ffff", | ||||||
|  |                 ahex = "#ff0000ff", | ||||||
|  |                 ahexUInt = 0xff0000ffu, | ||||||
|  |                 rgbUInt = 0x0000ffu, | ||||||
|  |                 rgb = "rgb(0,0,255)", | ||||||
|  |                 rgba = "rgba(0,0,255,1.0)", | ||||||
|  |                 r = 0x00, | ||||||
|  |                 g = 0x00, | ||||||
|  |                 b = 0xff, | ||||||
|  |                 a = 0xff, | ||||||
|  |                 "rgba(0,0,255,1)" | ||||||
|  |             ), | ||||||
|  |             TestColor( | ||||||
|  |                 color = HEXAColor(0xff000088u), | ||||||
|  |                 shortHex = "#f00", | ||||||
|  |                 shortHexa = "#f008", | ||||||
|  |                 hex = "#ff0000", | ||||||
|  |                 hexa = "#ff000088", | ||||||
|  |                 ahex = "#88ff0000", | ||||||
|  |                 ahexUInt = 0x88ff0000u, | ||||||
|  |                 rgbUInt = 0xff0000u, | ||||||
|  |                 rgb = "rgb(255,0,0)", | ||||||
|  |                 rgba = "rgba(255,0,0,0.533)", | ||||||
|  |                 r = 0xff, | ||||||
|  |                 g = 0x00, | ||||||
|  |                 b = 0x00, | ||||||
|  |                 a = 0x88, | ||||||
|  |             ), | ||||||
|  |             TestColor( | ||||||
|  |                 color = HEXAColor(0x00ff0088u), | ||||||
|  |                 shortHex = "#0f0", | ||||||
|  |                 shortHexa = "#0f08", | ||||||
|  |                 hex = "#00ff00", | ||||||
|  |                 hexa = "#00ff0088", | ||||||
|  |                 ahex = "#8800ff00", | ||||||
|  |                 ahexUInt = 0x8800ff00u, | ||||||
|  |                 rgbUInt = 0x00ff00u, | ||||||
|  |                 rgb = "rgb(0,255,0)", | ||||||
|  |                 rgba = "rgba(0,255,0,0.533)", | ||||||
|  |                 r = 0x00, | ||||||
|  |                 g = 0xff, | ||||||
|  |                 b = 0x00, | ||||||
|  |                 a = 0x88, | ||||||
|  |             ), | ||||||
|  |             TestColor( | ||||||
|  |                 color = HEXAColor(0x0000ff88u), | ||||||
|  |                 shortHex = "#00f", | ||||||
|  |                 shortHexa = "#00f8", | ||||||
|  |                 hex = "#0000ff", | ||||||
|  |                 hexa = "#0000ff88", | ||||||
|  |                 ahex = "#880000ff", | ||||||
|  |                 ahexUInt = 0x880000ffu, | ||||||
|  |                 rgbUInt = 0x0000ffu, | ||||||
|  |                 rgb = "rgb(0,0,255)", | ||||||
|  |                 rgba = "rgba(0,0,255,0.533)", | ||||||
|  |                 r = 0x00, | ||||||
|  |                 g = 0x00, | ||||||
|  |                 b = 0xff, | ||||||
|  |                 a = 0x88, | ||||||
|  |             ), | ||||||
|  |             TestColor( | ||||||
|  |                 color = HEXAColor(0xff000022u), | ||||||
|  |                 shortHex = "#f00", | ||||||
|  |                 shortHexa = "#f002", | ||||||
|  |                 hex = "#ff0000", | ||||||
|  |                 hexa = "#ff000022", | ||||||
|  |                 ahex = "#22ff0000", | ||||||
|  |                 ahexUInt = 0x22ff0000u, | ||||||
|  |                 rgbUInt = 0xff0000u, | ||||||
|  |                 rgb = "rgb(255,0,0)", | ||||||
|  |                 rgba = "rgba(255,0,0,0.133)", | ||||||
|  |                 r = 0xff, | ||||||
|  |                 g = 0x00, | ||||||
|  |                 b = 0x00, | ||||||
|  |                 a = 0x22, | ||||||
|  |             ), | ||||||
|  |             TestColor( | ||||||
|  |                 color = HEXAColor(0x00ff0022u), | ||||||
|  |                 shortHex = "#0f0", | ||||||
|  |                 shortHexa = "#0f02", | ||||||
|  |                 hex = "#00ff00", | ||||||
|  |                 hexa = "#00ff0022", | ||||||
|  |                 ahex = "#2200ff00", | ||||||
|  |                 ahexUInt = 0x2200ff00u, | ||||||
|  |                 rgbUInt = 0x00ff00u, | ||||||
|  |                 rgb = "rgb(0,255,0)", | ||||||
|  |                 rgba = "rgba(0,255,0,0.133)", | ||||||
|  |                 r = 0x00, | ||||||
|  |                 g = 0xff, | ||||||
|  |                 b = 0x00, | ||||||
|  |                 a = 0x22, | ||||||
|  |             ), | ||||||
|  |             TestColor( | ||||||
|  |                 color = HEXAColor(0x0000ff22u), | ||||||
|  |                 shortHex = "#00f", | ||||||
|  |                 shortHexa = "#00f2", | ||||||
|  |                 hex = "#0000ff", | ||||||
|  |                 hexa = "#0000ff22", | ||||||
|  |                 ahex = "#220000ff", | ||||||
|  |                 ahexUInt = 0x220000ffu, | ||||||
|  |                 rgbUInt = 0x0000ffu, | ||||||
|  |                 rgb = "rgb(0,0,255)", | ||||||
|  |                 rgba = "rgba(0,0,255,0.133)", | ||||||
|  |                 r = 0x00, | ||||||
|  |                 g = 0x00, | ||||||
|  |                 b = 0xff, | ||||||
|  |                 a = 0x22, | ||||||
|  |             ), | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |     @Test | ||||||
|  |     fun baseTest() { | ||||||
|  |         testColors.forEach { | ||||||
|  |             assertEquals(it.hex, it.color.hex) | ||||||
|  |             assertEquals(it.hexa, it.color.hexa) | ||||||
|  |             assertEquals(it.ahex, it.color.ahex) | ||||||
|  |             assertEquals(it.rgbUInt, it.color.rgbUInt) | ||||||
|  |             assertEquals(it.ahexUInt, it.color.ahexUInt) | ||||||
|  |             assertEquals(it.shortHex, it.color.shortHex) | ||||||
|  |             assertEquals(it.shortHexa, it.color.shortHexa) | ||||||
|  |             assertEquals(it.rgb, it.color.rgb) | ||||||
|  |             assertTrue(it.rgba == it.color.rgba || it.color.rgba in it.additionalRGBAVariants) | ||||||
|  |             assertEquals(it.r, it.color.r) | ||||||
|  |             assertEquals(it.g, it.color.g) | ||||||
|  |             assertEquals(it.b, it.color.b) | ||||||
|  |             assertEquals(it.a, it.color.a) | ||||||
|  |             assertEquals(it.color, HEXAColor.fromAhex(it.ahexUInt)) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     @Test | ||||||
|  |     fun testHexParseColor() { | ||||||
|  |         testColors.forEach { | ||||||
|  |             assertEquals(it.color.copy(aOfOne = 1f), HEXAColor.parseStringColor(it.hex)) | ||||||
|  |             assertEquals(it.color, HEXAColor.parseStringColor(it.hexa)) | ||||||
|  |             assertEquals(it.color.copy(aOfOne = 1f), HEXAColor.parseStringColor(it.rgb)) | ||||||
|  |             assertTrue(it.color.hexaUInt.toInt() - HEXAColor.parseStringColor(it.rgba).hexaUInt.toInt() in -0x1 .. 0x1, ) | ||||||
|  |             assertEquals(it.color.copy(aOfOne = 1f), HEXAColor.parseStringColor(it.shortHex)) | ||||||
|  |             assertEquals(it.color.copy(a = floor(it.color.a.toFloat() / 16).toInt() * 0x10), HEXAColor.parseStringColor(it.shortHexa)) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										298
									
								
								colors/src/commonMain/kotlin/StandardColors.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										298
									
								
								colors/src/commonMain/kotlin/StandardColors.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,298 @@ | |||||||
|  | package dev.inmo.micro_utils.colors | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.colors.common.HEXAColor | ||||||
|  |  | ||||||
|  | val HEXAColor.Companion.aliceblue | ||||||
|  |     get() = HEXAColor(0xF0F8FFFFu) | ||||||
|  | val HEXAColor.Companion.antiquewhite | ||||||
|  |     get() = HEXAColor(0xFAEBD7FFu) | ||||||
|  | val HEXAColor.Companion.aqua | ||||||
|  |     get() = HEXAColor(0x00FFFFFFu) | ||||||
|  | val HEXAColor.Companion.aquamarine | ||||||
|  |     get() = HEXAColor(0x7FFFD4FFu) | ||||||
|  | val HEXAColor.Companion.azure | ||||||
|  |     get() = HEXAColor(0xF0FFFFFFu) | ||||||
|  | val HEXAColor.Companion.beige | ||||||
|  |     get() = HEXAColor(0xF5F5DCFFu) | ||||||
|  | val HEXAColor.Companion.bisque | ||||||
|  |     get() = HEXAColor(0xFFE4C4FFu) | ||||||
|  | val HEXAColor.Companion.black | ||||||
|  |     get() = HEXAColor(0x000000FFu) | ||||||
|  | val HEXAColor.Companion.blanchedalmond | ||||||
|  |     get() = HEXAColor(0xFFEBCDFFu) | ||||||
|  | val HEXAColor.Companion.blue | ||||||
|  |     get() = HEXAColor(0x0000FFFFu) | ||||||
|  | val HEXAColor.Companion.blueviolet | ||||||
|  |     get() = HEXAColor(0x8A2BE2FFu) | ||||||
|  | val HEXAColor.Companion.brown | ||||||
|  |     get() = HEXAColor(0xA52A2AFFu) | ||||||
|  | val HEXAColor.Companion.burlywood | ||||||
|  |     get() = HEXAColor(0xDEB887FFu) | ||||||
|  | val HEXAColor.Companion.cadetblue | ||||||
|  |     get() = HEXAColor(0x5F9EA0FFu) | ||||||
|  | val HEXAColor.Companion.chartreuse | ||||||
|  |     get() = HEXAColor(0x7FFF00FFu) | ||||||
|  | val HEXAColor.Companion.chocolate | ||||||
|  |     get() = HEXAColor(0xD2691EFFu) | ||||||
|  | val HEXAColor.Companion.coral | ||||||
|  |     get() = HEXAColor(0xFF7F50FFu) | ||||||
|  | val HEXAColor.Companion.cornflowerblue | ||||||
|  |     get() = HEXAColor(0x6495EDFFu) | ||||||
|  | val HEXAColor.Companion.cornsilk | ||||||
|  |     get() = HEXAColor(0xFFF8DCFFu) | ||||||
|  | val HEXAColor.Companion.crimson | ||||||
|  |     get() = HEXAColor(0xDC143CFFu) | ||||||
|  | val HEXAColor.Companion.cyan | ||||||
|  |     get() = HEXAColor(0x00FFFFFFu) | ||||||
|  | val HEXAColor.Companion.darkblue | ||||||
|  |     get() = HEXAColor(0x00008BFFu) | ||||||
|  | val HEXAColor.Companion.darkcyan | ||||||
|  |     get() = HEXAColor(0x008B8BFFu) | ||||||
|  | val HEXAColor.Companion.darkgoldenrod | ||||||
|  |     get() = HEXAColor(0xB8860BFFu) | ||||||
|  | val HEXAColor.Companion.darkgray | ||||||
|  |     get() = HEXAColor(0xA9A9A9FFu) | ||||||
|  | val HEXAColor.Companion.darkgreen | ||||||
|  |     get() = HEXAColor(0x006400FFu) | ||||||
|  | val HEXAColor.Companion.darkgrey | ||||||
|  |     get() = HEXAColor(0xA9A9A9FFu) | ||||||
|  | val HEXAColor.Companion.darkkhaki | ||||||
|  |     get() = HEXAColor(0xBDB76BFFu) | ||||||
|  | val HEXAColor.Companion.darkmagenta | ||||||
|  |     get() = HEXAColor(0x8B008BFFu) | ||||||
|  | val HEXAColor.Companion.darkolivegreen | ||||||
|  |     get() = HEXAColor(0x556B2FFFu) | ||||||
|  | val HEXAColor.Companion.darkorange | ||||||
|  |     get() = HEXAColor(0xFF8C00FFu) | ||||||
|  | val HEXAColor.Companion.darkorchid | ||||||
|  |     get() = HEXAColor(0x9932CCFFu) | ||||||
|  | val HEXAColor.Companion.darkred | ||||||
|  |     get() = HEXAColor(0x8B0000FFu) | ||||||
|  | val HEXAColor.Companion.darksalmon | ||||||
|  |     get() = HEXAColor(0xE9967AFFu) | ||||||
|  | val HEXAColor.Companion.darkseagreen | ||||||
|  |     get() = HEXAColor(0x8FBC8FFFu) | ||||||
|  | val HEXAColor.Companion.darkslateblue | ||||||
|  |     get() = HEXAColor(0x483D8BFFu) | ||||||
|  | val HEXAColor.Companion.darkslategray | ||||||
|  |     get() = HEXAColor(0x2F4F4FFFu) | ||||||
|  | val HEXAColor.Companion.darkslategrey | ||||||
|  |     get() = HEXAColor(0x2F4F4FFFu) | ||||||
|  | val HEXAColor.Companion.darkturquoise | ||||||
|  |     get() = HEXAColor(0x00CED1FFu) | ||||||
|  | val HEXAColor.Companion.darkviolet | ||||||
|  |     get() = HEXAColor(0x9400D3FFu) | ||||||
|  | val HEXAColor.Companion.deeppink | ||||||
|  |     get() = HEXAColor(0xFF1493FFu) | ||||||
|  | val HEXAColor.Companion.deepskyblue | ||||||
|  |     get() = HEXAColor(0x00BFFFFFu) | ||||||
|  | val HEXAColor.Companion.dimgray | ||||||
|  |     get() = HEXAColor(0x696969FFu) | ||||||
|  | val HEXAColor.Companion.dimgrey | ||||||
|  |     get() = HEXAColor(0x696969FFu) | ||||||
|  | val HEXAColor.Companion.dodgerblue | ||||||
|  |     get() = HEXAColor(0x1E90FFFFu) | ||||||
|  | val HEXAColor.Companion.firebrick | ||||||
|  |     get() = HEXAColor(0xB22222FFu) | ||||||
|  | val HEXAColor.Companion.floralwhite | ||||||
|  |     get() = HEXAColor(0xFFFAF0FFu) | ||||||
|  | val HEXAColor.Companion.forestgreen | ||||||
|  |     get() = HEXAColor(0x228B22FFu) | ||||||
|  | val HEXAColor.Companion.fuchsia | ||||||
|  |     get() = HEXAColor(0xFF00FFFFu) | ||||||
|  | val HEXAColor.Companion.gainsboro | ||||||
|  |     get() = HEXAColor(0xDCDCDCFFu) | ||||||
|  | val HEXAColor.Companion.ghostwhite | ||||||
|  |     get() = HEXAColor(0xF8F8FFFFu) | ||||||
|  | val HEXAColor.Companion.gold | ||||||
|  |     get() = HEXAColor(0xFFD700FFu) | ||||||
|  | val HEXAColor.Companion.goldenrod | ||||||
|  |     get() = HEXAColor(0xDAA520FFu) | ||||||
|  | val HEXAColor.Companion.gray | ||||||
|  |     get() = HEXAColor(0x808080FFu) | ||||||
|  | val HEXAColor.Companion.green | ||||||
|  |     get() = HEXAColor(0x008000FFu) | ||||||
|  | val HEXAColor.Companion.greenyellow | ||||||
|  |     get() = HEXAColor(0xADFF2FFFu) | ||||||
|  | val HEXAColor.Companion.grey | ||||||
|  |     get() = HEXAColor(0x808080FFu) | ||||||
|  | val HEXAColor.Companion.honeydew | ||||||
|  |     get() = HEXAColor(0xF0FFF0FFu) | ||||||
|  | val HEXAColor.Companion.hotpink | ||||||
|  |     get() = HEXAColor(0xFF69B4FFu) | ||||||
|  | val HEXAColor.Companion.indianred | ||||||
|  |     get() = HEXAColor(0xCD5C5CFFu) | ||||||
|  | val HEXAColor.Companion.indigo | ||||||
|  |     get() = HEXAColor(0x4B0082FFu) | ||||||
|  | val HEXAColor.Companion.ivory | ||||||
|  |     get() = HEXAColor(0xFFFFF0FFu) | ||||||
|  | val HEXAColor.Companion.khaki | ||||||
|  |     get() = HEXAColor(0xF0E68CFFu) | ||||||
|  | val HEXAColor.Companion.lavender | ||||||
|  |     get() = HEXAColor(0xE6E6FAFFu) | ||||||
|  | val HEXAColor.Companion.lavenderblush | ||||||
|  |     get() = HEXAColor(0xFFF0F5FFu) | ||||||
|  | val HEXAColor.Companion.lawngreen | ||||||
|  |     get() = HEXAColor(0x7CFC00FFu) | ||||||
|  | val HEXAColor.Companion.lemonchiffon | ||||||
|  |     get() = HEXAColor(0xFFFACDFFu) | ||||||
|  | val HEXAColor.Companion.lightblue | ||||||
|  |     get() = HEXAColor(0xADD8E6FFu) | ||||||
|  | val HEXAColor.Companion.lightcoral | ||||||
|  |     get() = HEXAColor(0xF08080FFu) | ||||||
|  | val HEXAColor.Companion.lightcyan | ||||||
|  |     get() = HEXAColor(0xE0FFFFFFu) | ||||||
|  | val HEXAColor.Companion.lightgoldenrodyellow | ||||||
|  |     get() = HEXAColor(0xFAFAD2FFu) | ||||||
|  | val HEXAColor.Companion.lightgray | ||||||
|  |     get() = HEXAColor(0xD3D3D3FFu) | ||||||
|  | val HEXAColor.Companion.lightgreen | ||||||
|  |     get() = HEXAColor(0x90EE90FFu) | ||||||
|  | val HEXAColor.Companion.lightgrey | ||||||
|  |     get() = HEXAColor(0xD3D3D3FFu) | ||||||
|  | val HEXAColor.Companion.lightpink | ||||||
|  |     get() = HEXAColor(0xFFB6C1FFu) | ||||||
|  | val HEXAColor.Companion.lightsalmon | ||||||
|  |     get() = HEXAColor(0xFFA07AFFu) | ||||||
|  | val HEXAColor.Companion.lightseagreen | ||||||
|  |     get() = HEXAColor(0x20B2AAFFu) | ||||||
|  | val HEXAColor.Companion.lightskyblue | ||||||
|  |     get() = HEXAColor(0x87CEFAFFu) | ||||||
|  | val HEXAColor.Companion.lightslategray | ||||||
|  |     get() = HEXAColor(0x778899FFu) | ||||||
|  | val HEXAColor.Companion.lightslategrey | ||||||
|  |     get() = HEXAColor(0x778899FFu) | ||||||
|  | val HEXAColor.Companion.lightsteelblue | ||||||
|  |     get() = HEXAColor(0xB0C4DEFFu) | ||||||
|  | val HEXAColor.Companion.lightyellow | ||||||
|  |     get() = HEXAColor(0xFFFFE0FFu) | ||||||
|  | val HEXAColor.Companion.lime | ||||||
|  |     get() = HEXAColor(0x00FF00FFu) | ||||||
|  | val HEXAColor.Companion.limegreen | ||||||
|  |     get() = HEXAColor(0x32CD32FFu) | ||||||
|  | val HEXAColor.Companion.linen | ||||||
|  |     get() = HEXAColor(0xFAF0E6FFu) | ||||||
|  | val HEXAColor.Companion.magenta | ||||||
|  |     get() = HEXAColor(0xFF00FFFFu) | ||||||
|  | val HEXAColor.Companion.maroon | ||||||
|  |     get() = HEXAColor(0x800000FFu) | ||||||
|  | val HEXAColor.Companion.mediumaquamarine | ||||||
|  |     get() = HEXAColor(0x66CDAAFFu) | ||||||
|  | val HEXAColor.Companion.mediumblue | ||||||
|  |     get() = HEXAColor(0x0000CDFFu) | ||||||
|  | val HEXAColor.Companion.mediumorchid | ||||||
|  |     get() = HEXAColor(0xBA55D3FFu) | ||||||
|  | val HEXAColor.Companion.mediumpurple | ||||||
|  |     get() = HEXAColor(0x9370DBFFu) | ||||||
|  | val HEXAColor.Companion.mediumseagreen | ||||||
|  |     get() = HEXAColor(0x3CB371FFu) | ||||||
|  | val HEXAColor.Companion.mediumslateblue | ||||||
|  |     get() = HEXAColor(0x7B68EEFFu) | ||||||
|  | val HEXAColor.Companion.mediumspringgreen | ||||||
|  |     get() = HEXAColor(0x00FA9AFFu) | ||||||
|  | val HEXAColor.Companion.mediumturquoise | ||||||
|  |     get() = HEXAColor(0x48D1CCFFu) | ||||||
|  | val HEXAColor.Companion.mediumvioletred | ||||||
|  |     get() = HEXAColor(0xC71585FFu) | ||||||
|  | val HEXAColor.Companion.midnightblue | ||||||
|  |     get() = HEXAColor(0x191970FFu) | ||||||
|  | val HEXAColor.Companion.mintcream | ||||||
|  |     get() = HEXAColor(0xF5FFFAFFu) | ||||||
|  | val HEXAColor.Companion.mistyrose | ||||||
|  |     get() = HEXAColor(0xFFE4E1FFu) | ||||||
|  | val HEXAColor.Companion.moccasin | ||||||
|  |     get() = HEXAColor(0xFFE4B5FFu) | ||||||
|  | val HEXAColor.Companion.navajowhite | ||||||
|  |     get() = HEXAColor(0xFFDEADFFu) | ||||||
|  | val HEXAColor.Companion.navy | ||||||
|  |     get() = HEXAColor(0x000080FFu) | ||||||
|  | val HEXAColor.Companion.oldlace | ||||||
|  |     get() = HEXAColor(0xFDF5E6FFu) | ||||||
|  | val HEXAColor.Companion.olive | ||||||
|  |     get() = HEXAColor(0x808000FFu) | ||||||
|  | val HEXAColor.Companion.olivedrab | ||||||
|  |     get() = HEXAColor(0x6B8E23FFu) | ||||||
|  | val HEXAColor.Companion.orange | ||||||
|  |     get() = HEXAColor(0xFFA500FFu) | ||||||
|  | val HEXAColor.Companion.orangered | ||||||
|  |     get() = HEXAColor(0xFF4500FFu) | ||||||
|  | val HEXAColor.Companion.orchid | ||||||
|  |     get() = HEXAColor(0xDA70D6FFu) | ||||||
|  | val HEXAColor.Companion.palegoldenrod | ||||||
|  |     get() = HEXAColor(0xEEE8AAFFu) | ||||||
|  | val HEXAColor.Companion.palegreen | ||||||
|  |     get() = HEXAColor(0x98FB98FFu) | ||||||
|  | val HEXAColor.Companion.paleturquoise | ||||||
|  |     get() = HEXAColor(0xAFEEEEFFu) | ||||||
|  | val HEXAColor.Companion.palevioletred | ||||||
|  |     get() = HEXAColor(0xDB7093FFu) | ||||||
|  | val HEXAColor.Companion.papayawhip | ||||||
|  |     get() = HEXAColor(0xFFEFD5FFu) | ||||||
|  | val HEXAColor.Companion.peachpuff | ||||||
|  |     get() = HEXAColor(0xFFDAB9FFu) | ||||||
|  | val HEXAColor.Companion.peru | ||||||
|  |     get() = HEXAColor(0xCD853FFFu) | ||||||
|  | val HEXAColor.Companion.pink | ||||||
|  |     get() = HEXAColor(0xFFC0CBFFu) | ||||||
|  | val HEXAColor.Companion.plum | ||||||
|  |     get() = HEXAColor(0xDDA0DDFFu) | ||||||
|  | val HEXAColor.Companion.powderblue | ||||||
|  |     get() = HEXAColor(0xB0E0E6FFu) | ||||||
|  | val HEXAColor.Companion.purple | ||||||
|  |     get() = HEXAColor(0x800080FFu) | ||||||
|  | val HEXAColor.Companion.red | ||||||
|  |     get() = HEXAColor(0xFF0000FFu) | ||||||
|  | val HEXAColor.Companion.rosybrown | ||||||
|  |     get() = HEXAColor(0xBC8F8FFFu) | ||||||
|  | val HEXAColor.Companion.royalblue | ||||||
|  |     get() = HEXAColor(0x4169E1FFu) | ||||||
|  | val HEXAColor.Companion.saddlebrown | ||||||
|  |     get() = HEXAColor(0x8B4513FFu) | ||||||
|  | val HEXAColor.Companion.salmon | ||||||
|  |     get() = HEXAColor(0xFA8072FFu) | ||||||
|  | val HEXAColor.Companion.sandybrown | ||||||
|  |     get() = HEXAColor(0xF4A460FFu) | ||||||
|  | val HEXAColor.Companion.seagreen | ||||||
|  |     get() = HEXAColor(0x2E8B57FFu) | ||||||
|  | val HEXAColor.Companion.seashell | ||||||
|  |     get() = HEXAColor(0xFFF5EEFFu) | ||||||
|  | val HEXAColor.Companion.sienna | ||||||
|  |     get() = HEXAColor(0xA0522DFFu) | ||||||
|  | val HEXAColor.Companion.silver | ||||||
|  |     get() = HEXAColor(0xC0C0C0FFu) | ||||||
|  | val HEXAColor.Companion.skyblue | ||||||
|  |     get() = HEXAColor(0x87CEEBFFu) | ||||||
|  | val HEXAColor.Companion.slateblue | ||||||
|  |     get() = HEXAColor(0x6A5ACDFFu) | ||||||
|  | val HEXAColor.Companion.slategray | ||||||
|  |     get() = HEXAColor(0x708090FFu) | ||||||
|  | val HEXAColor.Companion.slategrey | ||||||
|  |     get() = HEXAColor(0x708090FFu) | ||||||
|  | val HEXAColor.Companion.snow | ||||||
|  |     get() = HEXAColor(0xFFFAFAFFu) | ||||||
|  | val HEXAColor.Companion.springgreen | ||||||
|  |     get() = HEXAColor(0x00FF7FFFu) | ||||||
|  | val HEXAColor.Companion.steelblue | ||||||
|  |     get() = HEXAColor(0x4682B4FFu) | ||||||
|  | val HEXAColor.Companion.tan | ||||||
|  |     get() = HEXAColor(0xD2B48CFFu) | ||||||
|  | val HEXAColor.Companion.teal | ||||||
|  |     get() = HEXAColor(0x008080FFu) | ||||||
|  | val HEXAColor.Companion.thistle | ||||||
|  |     get() = HEXAColor(0xD8BFD8FFu) | ||||||
|  | val HEXAColor.Companion.tomato | ||||||
|  |     get() = HEXAColor(0xFF6347FFu) | ||||||
|  | val HEXAColor.Companion.turquoise | ||||||
|  |     get() = HEXAColor(0x40E0D0FFu) | ||||||
|  | val HEXAColor.Companion.violet | ||||||
|  |     get() = HEXAColor(0xEE82EEFFu) | ||||||
|  | val HEXAColor.Companion.wheat | ||||||
|  |     get() = HEXAColor(0xF5DEB3FFu) | ||||||
|  | val HEXAColor.Companion.white | ||||||
|  |     get() = HEXAColor(0xFFFFFFFFu) | ||||||
|  | val HEXAColor.Companion.whitesmoke | ||||||
|  |     get() = HEXAColor(0xF5F5F5FFu) | ||||||
|  | val HEXAColor.Companion.yellow | ||||||
|  |     get() = HEXAColor(0xFFFF00FFu) | ||||||
|  | val HEXAColor.Companion.yellowgreen | ||||||
|  |     get() = HEXAColor(0x9ACD32FFu) | ||||||
| @@ -4,10 +4,15 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppProjectWithSerializationPresetPath" | apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|  |         commonMain { | ||||||
|  |             dependencies { | ||||||
|  |                 api libs.klock | ||||||
|  |             } | ||||||
|  |         } | ||||||
|         jvmMain { |         jvmMain { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 api project(":micro_utils.coroutines") |                 api project(":micro_utils.coroutines") | ||||||
| @@ -15,18 +20,11 @@ kotlin { | |||||||
|         } |         } | ||||||
|         androidMain { |         androidMain { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 api project(":micro_utils.coroutines") |  | ||||||
|                 api libs.android.fragment |                 api libs.android.fragment | ||||||
|             } |             } | ||||||
|             dependsOn jvmMain |  | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         linuxX64Main { |         nativeMain { | ||||||
|             dependencies { |  | ||||||
|                 api libs.okio |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         mingwX64Main { |  | ||||||
|             dependencies { |             dependencies { | ||||||
|                 api libs.okio |                 api libs.okio | ||||||
|             } |             } | ||||||
|   | |||||||
| @@ -3,9 +3,10 @@ plugins { | |||||||
|     id "org.jetbrains.kotlin.plugin.serialization" |     id "org.jetbrains.kotlin.plugin.serialization" | ||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
|     alias(libs.plugins.jb.compose) |     alias(libs.plugins.jb.compose) | ||||||
|  |     alias(libs.plugins.kt.jb.compose) | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppProjectWithSerializationAndComposePresetPath" | apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -0,0 +1,19 @@ | |||||||
|  | package dev.inmo.micro_utils.common.compose | ||||||
|  |  | ||||||
|  | import org.jetbrains.compose.web.dom.AttrBuilderContext | ||||||
|  | import org.w3c.dom.Element | ||||||
|  |  | ||||||
|  | operator fun <T : Element> AttrBuilderContext<T>?.plus( | ||||||
|  |     other: AttrBuilderContext<T>? | ||||||
|  | ) = when (this) { | ||||||
|  |     null -> other ?: {} | ||||||
|  |     else -> when (other) { | ||||||
|  |         null -> this ?: {} | ||||||
|  |         else -> { | ||||||
|  |             { | ||||||
|  |                 invoke(this) | ||||||
|  |                 other(this) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,22 @@ | |||||||
|  | package dev.inmo.micro_utils.common.compose | ||||||
|  |  | ||||||
|  | import androidx.compose.runtime.Composable | ||||||
|  | import androidx.compose.runtime.DisposableEffect | ||||||
|  | import androidx.compose.runtime.DisposableEffectResult | ||||||
|  | import androidx.compose.runtime.DisposableEffectScope | ||||||
|  | import org.jetbrains.compose.web.attributes.AttrsScope | ||||||
|  | import org.jetbrains.compose.web.dom.ElementScope | ||||||
|  | import org.w3c.dom.Element | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * This function must be called in the context of your tag content. It works like default [AttrsScope.ref], | ||||||
|  |  * but able to be used several times. Uses [DisposableEffect] under the hood | ||||||
|  |  */ | ||||||
|  | @Composable | ||||||
|  | fun <T : Element> ElementScope<T>.ref( | ||||||
|  |     block: DisposableEffectScope.(T) -> DisposableEffectResult | ||||||
|  | ) { | ||||||
|  |     DisposableEffect(0) { | ||||||
|  |         block(scopeElement) | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,11 @@ | |||||||
|  | package dev.inmo.micro_utils.common.compose | ||||||
|  |  | ||||||
|  | import org.jetbrains.compose.web.dom.AttrBuilderContext | ||||||
|  |  | ||||||
|  | fun tagClasses(vararg classnames: String): AttrBuilderContext<*> = { | ||||||
|  |     classes(*classnames) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun tagId(id: String): AttrBuilderContext<*> = { | ||||||
|  |     id(id) | ||||||
|  | } | ||||||
| @@ -1 +0,0 @@ | |||||||
| <manifest/> |  | ||||||
| @@ -0,0 +1,25 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import korlibs.time.DateTime | ||||||
|  | import kotlinx.serialization.KSerializer | ||||||
|  | import kotlinx.serialization.Serializer | ||||||
|  | import kotlinx.serialization.builtins.serializer | ||||||
|  | import kotlinx.serialization.descriptors.SerialDescriptor | ||||||
|  | import kotlinx.serialization.encoding.Decoder | ||||||
|  | import kotlinx.serialization.encoding.Encoder | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Serializes [DateTime] as its raw [DateTime.unixMillis] and deserializes in the same way | ||||||
|  |  */ | ||||||
|  | object DateTimeSerializer : KSerializer<DateTime> { | ||||||
|  |     override val descriptor: SerialDescriptor | ||||||
|  |         get() = Double.serializer().descriptor | ||||||
|  |  | ||||||
|  |     override fun deserialize(decoder: Decoder): DateTime { | ||||||
|  |         return DateTime(decoder.decodeDouble()) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override fun serialize(encoder: Encoder, value: DateTime) { | ||||||
|  |         encoder.encodeDouble(value.unixMillis) | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -8,7 +8,7 @@ private inline fun <T> getObject( | |||||||
|     additional: MutableList<T>, |     additional: MutableList<T>, | ||||||
|     iterator: Iterator<T> |     iterator: Iterator<T> | ||||||
| ): T? = when { | ): T? = when { | ||||||
|     additional.isNotEmpty() -> additional.removeFirst() |     additional.isNotEmpty() -> additional.removeAt(0) | ||||||
|     iterator.hasNext() -> iterator.next() |     iterator.hasNext() -> iterator.next() | ||||||
|     else -> null |     else -> null | ||||||
| } | } | ||||||
| @@ -27,7 +27,7 @@ private inline fun <T> getObject( | |||||||
|  * @see calculateDiff |  * @see calculateDiff | ||||||
|  */ |  */ | ||||||
| @Serializable | @Serializable | ||||||
| data class Diff<T> internal constructor( | data class Diff<T> @Warning(warning) constructor( | ||||||
|     val removed: List<@Serializable(IndexedValueSerializer::class) IndexedValue<T>>, |     val removed: List<@Serializable(IndexedValueSerializer::class) IndexedValue<T>>, | ||||||
|     /** |     /** | ||||||
|      * Old-New values pairs |      * Old-New values pairs | ||||||
| @@ -36,6 +36,10 @@ data class Diff<T> internal constructor( | |||||||
|     val added: List<@Serializable(IndexedValueSerializer::class) IndexedValue<T>> |     val added: List<@Serializable(IndexedValueSerializer::class) IndexedValue<T>> | ||||||
| ) { | ) { | ||||||
|     fun isEmpty(): Boolean = removed.isEmpty() && replaced.isEmpty() && added.isEmpty() |     fun isEmpty(): Boolean = removed.isEmpty() && replaced.isEmpty() && added.isEmpty() | ||||||
|  |  | ||||||
|  |     companion object { | ||||||
|  |         private const val warning = "This feature can be changed without any warranties. Use with caution and only in case you know what you are doing" | ||||||
|  |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| fun <T> emptyDiff(): Diff<T> = Diff(emptyList(), emptyList(), emptyList()) | fun <T> emptyDiff(): Diff<T> = Diff(emptyList(), emptyList(), emptyList()) | ||||||
|   | |||||||
| @@ -0,0 +1,5 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | fun <T> Iterable<T>.withReplacedAt(i: Int, block: (T) -> T): List<T> = take(i) + block(elementAt(i)) + drop(i + 1) | ||||||
|  | fun <T> Iterable<T>.withReplaced(t: T, block: (T) -> T): List<T> = withReplacedAt(indexOf(t), block) | ||||||
|  |  | ||||||
| @@ -0,0 +1,21 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlin.test.Test | ||||||
|  | import kotlin.test.assertEquals | ||||||
|  |  | ||||||
|  | class WithReplacedTest { | ||||||
|  |     @Test | ||||||
|  |     fun testReplaced() { | ||||||
|  |         val data = 0 until 10 | ||||||
|  |         val testData = Int.MAX_VALUE | ||||||
|  |  | ||||||
|  |         for (i in 0 until data.last) { | ||||||
|  |             val withReplaced = data.withReplacedAt(i) { | ||||||
|  |                 testData | ||||||
|  |             } | ||||||
|  |             val dataAsMutableList = data.toMutableList() | ||||||
|  |             dataAsMutableList[i] = testData | ||||||
|  |             assertEquals(withReplaced, dataAsMutableList.toList()) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -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,29 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.browser.window | ||||||
|  | import org.w3c.files.Blob | ||||||
|  | import org.w3c.files.BlobPropertyBag | ||||||
|  | import kotlin.js.json | ||||||
|  |  | ||||||
|  | external class ClipboardItem(data: dynamic) | ||||||
|  |  | ||||||
|  | inline fun Blob.convertToClipboardItem(): ClipboardItem { | ||||||
|  |     val itemData: dynamic = json(this.type to this) | ||||||
|  |     return ClipboardItem(itemData) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | suspend fun copyImageURLToClipboard(imageUrl: String): Boolean { | ||||||
|  |     return runCatching { | ||||||
|  |         val response = window.fetch(imageUrl).await() | ||||||
|  |         val blob = response.blob().await() | ||||||
|  |         val data = arrayOf( | ||||||
|  |             Blob( | ||||||
|  |                 arrayOf(blob), | ||||||
|  |                 BlobPropertyBag("image/png") | ||||||
|  |             ).convertToClipboardItem() | ||||||
|  |         ).asDynamic() | ||||||
|  |         window.navigator.clipboard.write(data) | ||||||
|  |     }.onFailure { | ||||||
|  |         it.printStackTrace() | ||||||
|  |     }.isSuccess | ||||||
|  | } | ||||||
| @@ -1,36 +0,0 @@ | |||||||
| package dev.inmo.micro_utils.common |  | ||||||
|  |  | ||||||
| import okio.FileSystem |  | ||||||
| import okio.Path |  | ||||||
| import okio.use |  | ||||||
|  |  | ||||||
| actual typealias MPPFile = Path |  | ||||||
|  |  | ||||||
| /** |  | ||||||
|  * @suppress |  | ||||||
|  */ |  | ||||||
| actual val MPPFile.filename: FileName |  | ||||||
|     get() = FileName(toString()) |  | ||||||
| /** |  | ||||||
|  * @suppress |  | ||||||
|  */ |  | ||||||
| actual val MPPFile.filesize: Long |  | ||||||
|     get() = FileSystem.SYSTEM.openReadOnly(this).use { |  | ||||||
|         it.size() |  | ||||||
|     } |  | ||||||
| /** |  | ||||||
|  * @suppress |  | ||||||
|  */ |  | ||||||
| actual val MPPFile.bytesAllocatorSync: ByteArrayAllocator |  | ||||||
|     get() = { |  | ||||||
|         FileSystem.SYSTEM.read(this) { |  | ||||||
|             readByteArray() |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| /** |  | ||||||
|  * @suppress |  | ||||||
|  */ |  | ||||||
| actual val MPPFile.bytesAllocator: SuspendByteArrayAllocator |  | ||||||
|     get() = { |  | ||||||
|         bytesAllocatorSync() |  | ||||||
|     } |  | ||||||
| @@ -1,25 +0,0 @@ | |||||||
| package dev.inmo.micro_utils.common |  | ||||||
|  |  | ||||||
| import kotlinx.cinterop.* |  | ||||||
| import platform.posix.snprintf |  | ||||||
| import platform.posix.sprintf |  | ||||||
|  |  | ||||||
| @OptIn(ExperimentalForeignApi::class) |  | ||||||
| actual fun Float.fixed(signs: Int): Float { |  | ||||||
|     return memScoped { |  | ||||||
|         val buff = allocArray<ByteVar>(Float.SIZE_BYTES * 2) |  | ||||||
|  |  | ||||||
|         sprintf(buff, "%.${signs}f", this@fixed) |  | ||||||
|         buff.toKString().toFloat() |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| @OptIn(ExperimentalForeignApi::class) |  | ||||||
| actual fun Double.fixed(signs: Int): Double { |  | ||||||
|     return memScoped { |  | ||||||
|         val buff = allocArray<ByteVar>(Double.SIZE_BYTES * 2) |  | ||||||
|  |  | ||||||
|         sprintf(buff, "%.${signs}f", this@fixed) |  | ||||||
|         buff.toKString().toDouble() |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppProjectWithSerializationPresetPath" | apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
| @@ -22,7 +22,6 @@ kotlin { | |||||||
|             dependencies { |             dependencies { | ||||||
|                 api libs.kt.coroutines.android |                 api libs.kt.coroutines.android | ||||||
|             } |             } | ||||||
|             dependsOn(jvmMain) |  | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -3,9 +3,10 @@ plugins { | |||||||
|     id "org.jetbrains.kotlin.plugin.serialization" |     id "org.jetbrains.kotlin.plugin.serialization" | ||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
|     alias(libs.plugins.jb.compose) |     alias(libs.plugins.jb.compose) | ||||||
|  |     alias(libs.plugins.kt.jb.compose) | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppProjectWithSerializationAndComposePresetPath" | apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -1 +0,0 @@ | |||||||
| <manifest/> |  | ||||||
							
								
								
									
										24
									
								
								coroutines/compose/src/jvmTest/kotlin/FlowStateTests.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								coroutines/compose/src/jvmTest/kotlin/FlowStateTests.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,24 @@ | |||||||
|  | import androidx.compose.material.Button | ||||||
|  | import androidx.compose.material.Text | ||||||
|  | import androidx.compose.runtime.collectAsState | ||||||
|  | import androidx.compose.ui.test.* | ||||||
|  | import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow | ||||||
|  | import org.jetbrains.annotations.TestOnly | ||||||
|  | import kotlin.test.Test | ||||||
|  |  | ||||||
|  | class FlowStateTests { | ||||||
|  |     @OptIn(ExperimentalTestApi::class) | ||||||
|  |     @Test | ||||||
|  |     @TestOnly | ||||||
|  |     fun simpleTest() = runComposeUiTest { | ||||||
|  |         val flowState = SpecialMutableStateFlow(0) | ||||||
|  |         setContent { | ||||||
|  |             Button({ flowState.value++ }) { Text("Click") } | ||||||
|  |             Text(flowState.collectAsState().value.toString()) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         onNodeWithText(0.toString()).assertExists() | ||||||
|  |         onNodeWithText("Click").performClick() | ||||||
|  |         onNodeWithText(1.toString()).assertExists() | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -3,6 +3,12 @@ package dev.inmo.micro_utils.coroutines | |||||||
| import kotlinx.coroutines.* | import kotlinx.coroutines.* | ||||||
| import kotlin.coroutines.* | import kotlin.coroutines.* | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Trying to [Deferred.await] on all [this] [Deferred]s. The first [Deferred] completed its work will interrupt all | ||||||
|  |  * others awaits and, if [cancelOnResult] passed as true (**by default**), will also cancel all the others [Deferred]s | ||||||
|  |  * | ||||||
|  |  * @param scope Will be used to create [CoroutineScope.LinkedSupervisorScope] and launch joining of all [Job]s in it | ||||||
|  |  */ | ||||||
| suspend fun <T> Iterable<Deferred<T>>.awaitFirstWithDeferred( | suspend fun <T> Iterable<Deferred<T>>.awaitFirstWithDeferred( | ||||||
|     scope: CoroutineScope, |     scope: CoroutineScope, | ||||||
|     cancelOnResult: Boolean = true |     cancelOnResult: Boolean = true | ||||||
| @@ -24,10 +30,45 @@ suspend fun <T> Iterable<Deferred<T>>.awaitFirstWithDeferred( | |||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Trying to [Deferred.await] on all [this] [Deferred]s. The first [Deferred] completed its work will interrupt all | ||||||
|  |  * others awaits and, if [cancelOnResult] passed as true (**by default**), will also cancel all the others [Deferred]s | ||||||
|  |  * | ||||||
|  |  * @param scope Will be used to create [CoroutineScope.LinkedSupervisorScope] and launch joining of all [Job]s in it | ||||||
|  |  */ | ||||||
| suspend fun <T> Iterable<Deferred<T>>.awaitFirst( | suspend fun <T> Iterable<Deferred<T>>.awaitFirst( | ||||||
|     scope: CoroutineScope, |     scope: CoroutineScope, | ||||||
|     cancelOnResult: Boolean = true |     cancelOnResult: Boolean = true | ||||||
| ): T = awaitFirstWithDeferred(scope, cancelOnResult).second | ): T = awaitFirstWithDeferred(scope, cancelOnResult).second | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Trying to [Deferred.await] on all [this] [Deferred]s. The first [Deferred] completed its work will interrupt all | ||||||
|  |  * others awaits and, if [cancelOthers] passed as true (**by default**), will also cancel all the others [Deferred]s | ||||||
|  |  * | ||||||
|  |  * Creates [CoroutineScope] using [coroutineContext] for internal purposes | ||||||
|  |  */ | ||||||
| suspend fun <T> Iterable<Deferred<T>>.awaitFirst( | suspend fun <T> Iterable<Deferred<T>>.awaitFirst( | ||||||
|     cancelOthers: Boolean = true |     cancelOthers: Boolean = true | ||||||
| ): T = awaitFirst(CoroutineScope(coroutineContext), cancelOthers) | ): T = awaitFirst(CoroutineScope(coroutineContext), cancelOthers) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Trying to [Deferred.await] on all [deferreds]. The first [Deferred] completed its work will interrupt all | ||||||
|  |  * others awaits and, if [cancelOnResult] passed as true (**by default**), will also cancel all the others [deferreds] | ||||||
|  |  * | ||||||
|  |  * @param scope Will be used to create [CoroutineScope.LinkedSupervisorScope] and launch joining of all [Job]s in it | ||||||
|  |  */ | ||||||
|  | suspend fun <T> awaitFirst( | ||||||
|  |     vararg deferreds: Deferred<T>, | ||||||
|  |     scope: CoroutineScope, | ||||||
|  |     cancelOnResult: Boolean = true | ||||||
|  | ): T = deferreds.toList().awaitFirstWithDeferred(scope, cancelOnResult).second | ||||||
|  | /** | ||||||
|  |  * Trying to [Deferred.await] on all [deferreds]. The first [Deferred] completed its work will interrupt all | ||||||
|  |  * others awaits and, if [cancelOthers] passed as true (**by default**), will also cancel all the others [deferreds] | ||||||
|  |  * | ||||||
|  |  * Creates [CoroutineScope] using [coroutineContext] for internal purposes | ||||||
|  |  */ | ||||||
|  | suspend fun <T> awaitFirst( | ||||||
|  |     vararg deferreds: Deferred<T>, | ||||||
|  |     cancelOthers: Boolean = true | ||||||
|  | ): T = awaitFirst(*deferreds, scope = CoroutineScope(coroutineContext), cancelOnResult = cancelOthers) | ||||||
|   | |||||||
| @@ -0,0 +1,44 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlin.coroutines.CoroutineContext | ||||||
|  | import kotlin.coroutines.coroutineContext | ||||||
|  |  | ||||||
|  | typealias ExceptionHandler<T> = suspend (Throwable) -> T | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * This instance will be used in all calls of [safely] where exception handler has not been passed | ||||||
|  |  */ | ||||||
|  | var defaultSafelyExceptionHandler: ExceptionHandler<Nothing> = { throw it } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * This instance will be used in all calls of [safelyWithoutExceptions] as an exception handler for [safely] call | ||||||
|  |  */ | ||||||
|  | var defaultSafelyWithoutExceptionHandler: ExceptionHandler<Unit> = { | ||||||
|  |     try { | ||||||
|  |         defaultSafelyExceptionHandler(it) | ||||||
|  |     } catch (e: Throwable) { | ||||||
|  |         // do nothing | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * This key can (and will) be used to get [ContextSafelyExceptionHandler] from [coroutineContext] of suspend functions | ||||||
|  |  * and in [ContextSafelyExceptionHandler] for defining of its [CoroutineContext.Element.key] | ||||||
|  |  * | ||||||
|  |  * @see safelyWithContextExceptionHandler | ||||||
|  |  * @see ContextSafelyExceptionHandler | ||||||
|  |  */ | ||||||
|  | object ContextSafelyExceptionHandlerKey : CoroutineContext.Key<ContextSafelyExceptionHandler> | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * [ExceptionHandler] wrapper which was created to make possible to use [handler] across all coroutines calls | ||||||
|  |  * | ||||||
|  |  * @see safelyWithContextExceptionHandler | ||||||
|  |  * @see ContextSafelyExceptionHandlerKey | ||||||
|  |  */ | ||||||
|  | class ContextSafelyExceptionHandler( | ||||||
|  |     val handler: ExceptionHandler<Unit> | ||||||
|  | ) : CoroutineContext.Element { | ||||||
|  |     override val key: CoroutineContext.Key<*> | ||||||
|  |         get() = ContextSafelyExceptionHandlerKey | ||||||
|  | } | ||||||
| @@ -16,8 +16,8 @@ class DoWithFirstBuilder<T>( | |||||||
|     operator fun plus(block: suspend CoroutineScope.() -> T) { |     operator fun plus(block: suspend CoroutineScope.() -> T) { | ||||||
|         deferreds.add(scope.async(start = CoroutineStart.LAZY, block = block)) |         deferreds.add(scope.async(start = CoroutineStart.LAZY, block = block)) | ||||||
|     } |     } | ||||||
|     inline fun add(noinline block: suspend CoroutineScope.() -> T) = plus(block) |     fun add(block: suspend CoroutineScope.() -> T) = plus(block) | ||||||
|     inline fun include(noinline block: suspend CoroutineScope.() -> T) = plus(block) |     fun include(block: suspend CoroutineScope.() -> T) = plus(block) | ||||||
|  |  | ||||||
|     fun build() = deferreds.toList() |     fun build() = deferreds.toList() | ||||||
| } | } | ||||||
|   | |||||||
| @@ -0,0 +1,40 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlinx.coroutines.Job | ||||||
|  | import kotlinx.coroutines.async | ||||||
|  | import kotlinx.coroutines.delay | ||||||
|  | import kotlinx.coroutines.flow.* | ||||||
|  | import kotlinx.coroutines.sync.Mutex | ||||||
|  | import kotlinx.coroutines.sync.withLock | ||||||
|  | import kotlin.jvm.JvmInline | ||||||
|  | import kotlin.time.Duration | ||||||
|  |  | ||||||
|  | @JvmInline | ||||||
|  | private value class DebouncedByData<T>( | ||||||
|  |     val millisToData: Pair<Long, T> | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | fun <T> Flow<T>.debouncedBy(timeout: (T) -> Long, markerFactory: (T) -> Any?): Flow<T> = channelFlow { | ||||||
|  |     val jobs = mutableMapOf<Any?, Job>() | ||||||
|  |     val mutex = Mutex() | ||||||
|  |     subscribe(this) { | ||||||
|  |         mutex.withLock { | ||||||
|  |             val marker = markerFactory(it) | ||||||
|  |             lateinit var job: Job | ||||||
|  |             job = async { | ||||||
|  |                 delay(timeout(it)) | ||||||
|  |                 mutex.withLock { | ||||||
|  |                     if (jobs[marker] === job) { | ||||||
|  |                         this@channelFlow.send(it) | ||||||
|  |                         jobs.remove(marker) | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             jobs[marker] ?.cancel() | ||||||
|  |             jobs[marker] = job | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun <T> Flow<T>.debouncedBy(timeout: Long, markerFactory: (T) -> Any?): Flow<T> = debouncedBy({ timeout }, markerFactory) | ||||||
|  | fun <T> Flow<T>.debouncedBy(timeout: Duration, markerFactory: (T) -> Any?): Flow<T> = debouncedBy({ timeout.inWholeMilliseconds }, markerFactory) | ||||||
| @@ -85,32 +85,32 @@ fun <T, M> Flow<T>.subscribeAsync( | |||||||
|     return job |     return job | ||||||
| } | } | ||||||
|  |  | ||||||
| inline fun <T, M> Flow<T>.subscribeSafelyAsync( | fun <T, M> Flow<T>.subscribeSafelyAsync( | ||||||
|     scope: CoroutineScope, |     scope: CoroutineScope, | ||||||
|     noinline markerFactory: suspend (T) -> M, |     markerFactory: suspend (T) -> M, | ||||||
|     noinline onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler, |     onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler, | ||||||
|     noinline block: suspend (T) -> Unit |     block: suspend (T) -> Unit | ||||||
| ) = subscribeAsync(scope, markerFactory) { | ) = subscribeAsync(scope, markerFactory) { | ||||||
|     safely(onException) { |     safely(onException) { | ||||||
|         block(it) |         block(it) | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| inline fun <T, M> Flow<T>.subscribeSafelyWithoutExceptionsAsync( | fun <T, M> Flow<T>.subscribeSafelyWithoutExceptionsAsync( | ||||||
|     scope: CoroutineScope, |     scope: CoroutineScope, | ||||||
|     noinline markerFactory: suspend (T) -> M, |     markerFactory: suspend (T) -> M, | ||||||
|     noinline onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, |     onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||||
|     noinline block: suspend (T) -> Unit |     block: suspend (T) -> Unit | ||||||
| ) = subscribeAsync(scope, markerFactory) { | ) = subscribeAsync(scope, markerFactory) { | ||||||
|     safelyWithoutExceptions(onException) { |     safelyWithoutExceptions(onException) { | ||||||
|         block(it) |         block(it) | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| inline fun <T, M> Flow<T>.subscribeSafelySkippingExceptionsAsync( | fun <T, M> Flow<T>.subscribeSafelySkippingExceptionsAsync( | ||||||
|     scope: CoroutineScope, |     scope: CoroutineScope, | ||||||
|     noinline markerFactory: suspend (T) -> M, |     markerFactory: suspend (T) -> M, | ||||||
|     noinline block: suspend (T) -> Unit |     block: suspend (T) -> Unit | ||||||
| ) = subscribeAsync(scope, markerFactory) { | ) = subscribeAsync(scope, markerFactory) { | ||||||
|     safelyWithoutExceptions({ /* do nothing */}) { |     safelyWithoutExceptions({ /* do nothing */}) { | ||||||
|         block(it) |         block(it) | ||||||
|   | |||||||
| @@ -4,46 +4,58 @@ import kotlinx.coroutines.* | |||||||
| import kotlin.coroutines.CoroutineContext | import kotlin.coroutines.CoroutineContext | ||||||
| import kotlin.coroutines.coroutineContext | import kotlin.coroutines.coroutineContext | ||||||
|  |  | ||||||
| typealias ExceptionHandler<T> = suspend (Throwable) -> T |  | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * This instance will be used in all calls of [safely] where exception handler has not been passed |  * Launching [block] in [runCatching]. In case of failure, it will: | ||||||
|  |  * | ||||||
|  |  * * Try to get [ContextSafelyExceptionHandler] from current [coroutineContext] and call its | ||||||
|  |  * [ContextSafelyExceptionHandler.handler] invoke. **Thrown exception from its handler | ||||||
|  |  * will pass out of [runCatchingSafely]** | ||||||
|  |  * * Execute [onException] inside of new [runCatching] and return its result. Throws exception | ||||||
|  |  * will be caught by [runCatching] and wrapped in [Result] | ||||||
|  |  * | ||||||
|  |  * @return [Result] with result of [block] if no exceptions or [Result] from [onException] execution | ||||||
|  */ |  */ | ||||||
| var defaultSafelyExceptionHandler: ExceptionHandler<Nothing> = { throw it } | suspend inline fun <T> runCatchingSafely( | ||||||
|  |     onException: ExceptionHandler<T>, | ||||||
| /** |     block: suspend () -> T | ||||||
|  * This instance will be used in all calls of [safelyWithoutExceptions] as an exception handler for [safely] call | ): Result<T> { | ||||||
|  */ |     return runCatching { | ||||||
| var defaultSafelyWithoutExceptionHandler: ExceptionHandler<Unit> = { |         block() | ||||||
|     try { |     }.onFailure { | ||||||
|         defaultSafelyExceptionHandler(it) |         coroutineContext[ContextSafelyExceptionHandlerKey] ?.handler ?.invoke(it) | ||||||
|     } catch (e: Throwable) { |         return runCatching { | ||||||
|          // do nothing |             onException(it) | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| /** | suspend inline fun <T, R> R.runCatchingSafely( | ||||||
|  * This key can (and will) be used to get [ContextSafelyExceptionHandler] from [coroutineContext] of suspend functions |     onException: ExceptionHandler<T>, | ||||||
|  * and in [ContextSafelyExceptionHandler] for defining of its [CoroutineContext.Element.key] |     block: suspend R.() -> T | ||||||
|  * | ): Result<T> = runCatchingSafely<T>(onException) { | ||||||
|  * @see safelyWithContextExceptionHandler |     block() | ||||||
|  * @see ContextSafelyExceptionHandler | } | ||||||
|  */ |  | ||||||
| object ContextSafelyExceptionHandlerKey : CoroutineContext.Key<ContextSafelyExceptionHandler> |  | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * [ExceptionHandler] wrapper which was created to make possible to use [handler] across all coroutines calls |  * Launching [runCatchingSafely] with [defaultSafelyExceptionHandler] as `onException` parameter | ||||||
|  * |  | ||||||
|  * @see safelyWithContextExceptionHandler |  | ||||||
|  * @see ContextSafelyExceptionHandlerKey |  | ||||||
|  */ |  */ | ||||||
| class ContextSafelyExceptionHandler( | suspend inline fun <T> runCatchingSafely( | ||||||
|     val handler: ExceptionHandler<Unit> |     block: suspend () -> T | ||||||
| ) : CoroutineContext.Element { | ): Result<T> = runCatchingSafely(defaultSafelyExceptionHandler, block) | ||||||
|     override val key: CoroutineContext.Key<*> |  | ||||||
|         get() = ContextSafelyExceptionHandlerKey | suspend inline fun <T, R> R.runCatchingSafely( | ||||||
|  |     block: suspend R.() -> T | ||||||
|  | ): Result<T> = runCatchingSafely<T> { | ||||||
|  |     block() | ||||||
| } | } | ||||||
|  |  | ||||||
|  | //suspend inline fun <T, R> T.runCatchingSafely( | ||||||
|  | //    onException: ExceptionHandler<R>, | ||||||
|  | //    block: suspend T.() -> R | ||||||
|  | //): Result<R> = runCatchingSafely(onException) { | ||||||
|  | //    block() | ||||||
|  | //} | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * @return [ContextSafelyExceptionHandler] from [coroutineContext] by key [ContextSafelyExceptionHandlerKey] if |  * @return [ContextSafelyExceptionHandler] from [coroutineContext] by key [ContextSafelyExceptionHandlerKey] if | ||||||
|  * exists |  * exists | ||||||
| @@ -51,7 +63,7 @@ class ContextSafelyExceptionHandler( | |||||||
|  * @see ContextSafelyExceptionHandler |  * @see ContextSafelyExceptionHandler | ||||||
|  * @see ContextSafelyExceptionHandlerKey |  * @see ContextSafelyExceptionHandlerKey | ||||||
|  */ |  */ | ||||||
| suspend inline fun contextSafelyExceptionHandler() = coroutineContext[ContextSafelyExceptionHandlerKey] | suspend fun contextSafelyExceptionHandler() = coroutineContext[ContextSafelyExceptionHandlerKey] | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * This method will set new [coroutineContext] with [ContextSafelyExceptionHandler]. In case if [coroutineContext] |  * This method will set new [coroutineContext] with [ContextSafelyExceptionHandler]. In case if [coroutineContext] | ||||||
| @@ -64,7 +76,7 @@ suspend inline fun contextSafelyExceptionHandler() = coroutineContext[ContextSaf | |||||||
| suspend fun <T> safelyWithContextExceptionHandler( | suspend fun <T> safelyWithContextExceptionHandler( | ||||||
|     contextExceptionHandler: ExceptionHandler<Unit>, |     contextExceptionHandler: ExceptionHandler<Unit>, | ||||||
|     safelyExceptionHandler: ExceptionHandler<T> = defaultSafelyExceptionHandler, |     safelyExceptionHandler: ExceptionHandler<T> = defaultSafelyExceptionHandler, | ||||||
|     block: suspend CoroutineScope.() -> T |     block: suspend () -> T | ||||||
| ): T { | ): T { | ||||||
|     val contextSafelyExceptionHandler = contextSafelyExceptionHandler() ?.handler ?.let { oldHandler -> |     val contextSafelyExceptionHandler = contextSafelyExceptionHandler() ?.handler ?.let { oldHandler -> | ||||||
|         ContextSafelyExceptionHandler { |         ContextSafelyExceptionHandler { | ||||||
| @@ -78,57 +90,35 @@ suspend fun <T> safelyWithContextExceptionHandler( | |||||||
| } | } | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * It will run [block] inside of [supervisorScope] to avoid problems with catching of exceptions |  * Calls [runCatchingSafely] and getting the result via [Result.getOrThrow] | ||||||
|  * |  * | ||||||
|  * Priorities of [ExceptionHandler]s: |  * @see runCatchingSafely | ||||||
|  * |  | ||||||
|  * * [onException] In case if custom (will be used anyway if not [defaultSafelyExceptionHandler]) |  | ||||||
|  * * [CoroutineContext.get] with [SafelyExceptionHandlerKey] as key |  | ||||||
|  * * [defaultSafelyExceptionHandler] |  | ||||||
|  * |  | ||||||
|  * Remember, that [ExceptionHandler] from [CoroutineContext.get] will be used anyway if it is available. After it will |  | ||||||
|  * be called [onException] |  | ||||||
|  * |  | ||||||
|  * @param [onException] Will be called when happen exception inside of [block]. By default will throw exception - this |  | ||||||
|  * exception will be available for catching |  | ||||||
|  * |  | ||||||
|  * @see defaultSafelyExceptionHandler |  | ||||||
|  * @see safelyWithoutExceptions |  | ||||||
|  * @see safelyWithContextExceptionHandler |  | ||||||
|  */ |  */ | ||||||
| suspend inline fun <T> safely( | suspend inline fun <T> safely( | ||||||
|     noinline onException: ExceptionHandler<T> = defaultSafelyExceptionHandler, |     onException: ExceptionHandler<T>, | ||||||
|     noinline block: suspend CoroutineScope.() -> T |     block: suspend () -> T | ||||||
| ): T { | ): T = runCatchingSafely(onException, block).getOrThrow() | ||||||
|     return try { |  | ||||||
|         supervisorScope(block) |  | ||||||
|     } catch (e: Throwable) { |  | ||||||
|         coroutineContext[ContextSafelyExceptionHandlerKey] ?.handler ?.invoke(e) |  | ||||||
|         onException(e) |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| suspend inline fun <T> runCatchingSafely( | /** | ||||||
|     noinline onException: ExceptionHandler<T> = defaultSafelyExceptionHandler, |  * Calls [safely] with passing of [defaultSafelyExceptionHandler] as `onException` | ||||||
|     noinline block: suspend CoroutineScope.() -> T |  * | ||||||
| ): Result<T> = runCatching { |  * @see runCatchingSafely | ||||||
|     safely(onException, block) |  */ | ||||||
| } | suspend inline fun <T> safely( | ||||||
|  |     block: suspend () -> T | ||||||
|  | ): T = safely(defaultSafelyExceptionHandler, block) | ||||||
|  | suspend inline fun <T, R> R.safely( | ||||||
|  |     block: suspend R.() -> T | ||||||
|  | ): T = safely<T> { block() } | ||||||
|  |  | ||||||
| suspend inline fun <T, R> T.runCatchingSafely( | @Deprecated("Renamed", ReplaceWith("runCatchingSafely(block)", "dev.inmo.micro_utils.coroutines.runCatchingSafely")) | ||||||
|     noinline onException: ExceptionHandler<R> = defaultSafelyExceptionHandler, | suspend fun <T> safelyWithResult( | ||||||
|     noinline block: suspend T.() -> R |     block: suspend () -> T | ||||||
| ): Result<R> = runCatching { |  | ||||||
|     safely(onException) { block() } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| suspend inline fun <T> safelyWithResult( |  | ||||||
|     noinline block: suspend CoroutineScope.() -> T |  | ||||||
| ): Result<T> = runCatchingSafely(defaultSafelyExceptionHandler, block) | ): Result<T> = runCatchingSafely(defaultSafelyExceptionHandler, block) | ||||||
|  | @Deprecated("Renamed", ReplaceWith("this.runCatchingSafely(block)", "dev.inmo.micro_utils.coroutines.runCatchingSafely")) | ||||||
| suspend inline fun <T, R> T.safelyWithResult( | suspend fun <T, R> R.safelyWithResult( | ||||||
|     noinline block: suspend T.() -> R |     block: suspend R.() -> T | ||||||
| ): Result<R> = runCatchingSafely(defaultSafelyExceptionHandler, block) | ): Result<T> = safelyWithResult<T> { block() } | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Use this handler in cases you wish to include handling of exceptions by [defaultSafelyWithoutExceptionHandler] and |  * Use this handler in cases you wish to include handling of exceptions by [defaultSafelyWithoutExceptionHandler] and | ||||||
| @@ -147,21 +137,23 @@ val defaultSafelyWithoutExceptionHandlerWithNull: ExceptionHandler<Nothing?> = { | |||||||
|  * Shortcut for [safely] with exception handler, that as expected must return null in case of impossible creating of |  * Shortcut for [safely] with exception handler, that as expected must return null in case of impossible creating of | ||||||
|  * result from exception (instead of throwing it, by default always returns null) |  * result from exception (instead of throwing it, by default always returns null) | ||||||
|  */ |  */ | ||||||
| suspend inline fun <T> safelyWithoutExceptions( | suspend fun <T> safelyWithoutExceptions( | ||||||
|     noinline onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, |     onException: ExceptionHandler<T> = defaultSafelyExceptionHandler, | ||||||
|     noinline block: suspend CoroutineScope.() -> T |     block: suspend () -> T | ||||||
| ): T? = safely(onException, block) | ): T? = runCatchingSafely(onException, block).getOrNull() | ||||||
|  |  | ||||||
| suspend inline fun <T> runCatchingSafelyWithoutExceptions( | suspend fun <T> runCatchingSafelyWithoutExceptions( | ||||||
|     noinline onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, |     onException: ExceptionHandler<T?> = defaultSafelyExceptionHandler, | ||||||
|     noinline block: suspend CoroutineScope.() -> T |     block: suspend () -> T | ||||||
| ): Result<T?> = runCatching { | ): Result<T?> = runCatchingSafely(onException, block).let { | ||||||
|     safelyWithoutExceptions(onException, block) |     if (it.isFailure) return Result.success<T?>(null) | ||||||
|  |  | ||||||
|  |     it | ||||||
| } | } | ||||||
|  |  | ||||||
| inline fun CoroutineScope( | fun CoroutineScopeWithDefaultFallback( | ||||||
|     context: CoroutineContext, |     context: CoroutineContext, | ||||||
|     noinline defaultExceptionsHandler: ExceptionHandler<Unit> |     defaultExceptionsHandler: ExceptionHandler<Unit> | ||||||
| ) = CoroutineScope( | ) = CoroutineScope( | ||||||
|     context + ContextSafelyExceptionHandler(defaultExceptionsHandler) |     context + ContextSafelyExceptionHandler(defaultExceptionsHandler) | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -0,0 +1,64 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlinx.coroutines.* | ||||||
|  | import kotlin.coroutines.* | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Trying to [Job.join] on all [this] [Job]s. The first [Job] completed its work will interrupt all others joins | ||||||
|  |  * and, if [cancelOthers] passed as true (**by default**), will also cancel all the others [Job]s | ||||||
|  |  * | ||||||
|  |  * @param scope Will be used to create [CoroutineScope.LinkedSupervisorScope] and launch joining of all [Job]s in it | ||||||
|  |  */ | ||||||
|  | suspend fun Iterable<Job>.joinFirst( | ||||||
|  |     scope: CoroutineScope, | ||||||
|  |     cancelOthers: Boolean = true | ||||||
|  | ): Job { | ||||||
|  |     val resultDeferred = CompletableDeferred<Job>() | ||||||
|  |     val scope = scope.LinkedSupervisorScope() | ||||||
|  |     forEach { | ||||||
|  |         scope.launch { | ||||||
|  |             it.join() | ||||||
|  |             resultDeferred.complete(it) | ||||||
|  |             scope.cancel() | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     return resultDeferred.await().also { | ||||||
|  |         if (cancelOthers) { | ||||||
|  |             forEach { | ||||||
|  |                 runCatchingSafely { it.cancel() } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  | /** | ||||||
|  |  * Trying to [Job.join] on all [this] [Job]s. The first [Job] completed its work will interrupt all others joins | ||||||
|  |  * and, if [cancelOthers] passed as true (**by default**), will also cancel all the others [Job]s | ||||||
|  |  * | ||||||
|  |  * Creates [CoroutineScope] using [coroutineContext] for internal purposes | ||||||
|  |  */ | ||||||
|  | suspend fun Iterable<Job>.joinFirst( | ||||||
|  |     cancelOthers: Boolean = true | ||||||
|  | ): Job = joinFirst(CoroutineScope(coroutineContext), cancelOthers) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Trying to [Job.join] on all [jobs]. The first [Job] completed its work will interrupt all others joins | ||||||
|  |  * and, if [cancelOthers] passed as true (**by default**), will also cancel all the others [Job]s | ||||||
|  |  * | ||||||
|  |  * @param scope Will be used to create [CoroutineScope.LinkedSupervisorScope] and launch joining of all [Job]s in it | ||||||
|  |  */ | ||||||
|  | suspend fun joinFirst( | ||||||
|  |     vararg jobs: Job, | ||||||
|  |     scope: CoroutineScope, | ||||||
|  |     cancelOthers: Boolean = true | ||||||
|  | ): Job = jobs.toList().joinFirst(scope, cancelOthers) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Trying to [Job.join] on all [jobs]. The first [Job] completed its work will interrupt all others joins | ||||||
|  |  * and, if [cancelOthers] passed as true (**by default**), will also cancel all the others [Job]s | ||||||
|  |  * | ||||||
|  |  * Creates [CoroutineScope] using [coroutineContext] for internal purposes | ||||||
|  |  */ | ||||||
|  | suspend fun joinFirst( | ||||||
|  |     vararg jobs: Job, | ||||||
|  |     cancelOthers: Boolean = true | ||||||
|  | ): Job = joinFirst(*jobs, scope = CoroutineScope(coroutineContext), cancelOthers = cancelOthers) | ||||||
| @@ -4,38 +4,46 @@ import kotlinx.coroutines.* | |||||||
| import kotlin.coroutines.CoroutineContext | import kotlin.coroutines.CoroutineContext | ||||||
| import kotlin.coroutines.EmptyCoroutineContext | import kotlin.coroutines.EmptyCoroutineContext | ||||||
|  |  | ||||||
| inline fun CoroutineScope.launchSafely( | fun CoroutineScope.launchSafely( | ||||||
|     context: CoroutineContext = EmptyCoroutineContext, |     context: CoroutineContext = EmptyCoroutineContext, | ||||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, |     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||||
|     noinline onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler, |     onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler, | ||||||
|     noinline block: suspend CoroutineScope.() -> Unit |     block: suspend CoroutineScope.() -> Unit | ||||||
| ) = launch(context, start) { | ) = launch(context, start) { | ||||||
|     safely(onException, block) |     runCatchingSafely(onException) { | ||||||
|  |         block() | ||||||
|  |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| inline fun CoroutineScope.launchSafelyWithoutExceptions( | fun CoroutineScope.launchSafelyWithoutExceptions( | ||||||
|     context: CoroutineContext = EmptyCoroutineContext, |     context: CoroutineContext = EmptyCoroutineContext, | ||||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, |     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||||
|     noinline onException: ExceptionHandler<Unit?> = defaultSafelyWithoutExceptionHandlerWithNull, |     onException: ExceptionHandler<Unit?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||||
|     noinline block: suspend CoroutineScope.() -> Unit |     block: suspend CoroutineScope.() -> Unit | ||||||
| ) = launch(context, start) { | ) = launch(context, start) { | ||||||
|     safelyWithoutExceptions(onException, block) |     runCatchingSafelyWithoutExceptions(onException) { | ||||||
|  |         block() | ||||||
|  |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| inline fun <T> CoroutineScope.asyncSafely( | fun <T> CoroutineScope.asyncSafely( | ||||||
|     context: CoroutineContext = EmptyCoroutineContext, |     context: CoroutineContext = EmptyCoroutineContext, | ||||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, |     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||||
|     noinline onException: ExceptionHandler<T> = defaultSafelyExceptionHandler, |     onException: ExceptionHandler<T> = defaultSafelyExceptionHandler, | ||||||
|     noinline block: suspend CoroutineScope.() -> T |     block: suspend CoroutineScope.() -> T | ||||||
| ) = async(context, start) { | ) = async(context, start) { | ||||||
|     safely(onException, block) |     runCatchingSafely(onException) { | ||||||
|  |         block() | ||||||
|  |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| inline fun <T> CoroutineScope.asyncSafelyWithoutExceptions( | fun <T> CoroutineScope.asyncSafelyWithoutExceptions( | ||||||
|     context: CoroutineContext = EmptyCoroutineContext, |     context: CoroutineContext = EmptyCoroutineContext, | ||||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, |     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||||
|     noinline onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, |     onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||||
|     noinline block: suspend CoroutineScope.() -> T |     block: suspend CoroutineScope.() -> T | ||||||
| ) = async(context, start) { | ) = async(context, start) { | ||||||
|     safelyWithoutExceptions(onException, block) |     runCatchingSafelyWithoutExceptions(onException) { | ||||||
|  |         block() | ||||||
|  |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -44,7 +44,7 @@ sealed interface SmartMutex { | |||||||
|      * @param locked Preset state of [isLocked] and its internal [_lockStateFlow] |      * @param locked Preset state of [isLocked] and its internal [_lockStateFlow] | ||||||
|      */ |      */ | ||||||
|     class Mutable(locked: Boolean = false) : SmartMutex { |     class Mutable(locked: Boolean = false) : SmartMutex { | ||||||
|         private val _lockStateFlow = MutableStateFlow<Boolean>(locked) |         private val _lockStateFlow = SpecialMutableStateFlow<Boolean>(locked) | ||||||
|         override val lockStateFlow: StateFlow<Boolean> = _lockStateFlow.asStateFlow() |         override val lockStateFlow: StateFlow<Boolean> = _lockStateFlow.asStateFlow() | ||||||
|  |  | ||||||
|         private val internalChangesMutex = Mutex() |         private val internalChangesMutex = Mutex() | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ import kotlin.contracts.contract | |||||||
|  * * [unlockWrite] will just unlock [writeMutex] |  * * [unlockWrite] will just unlock [writeMutex] | ||||||
|  */ |  */ | ||||||
| class SmartRWLocker(private val readPermits: Int = Int.MAX_VALUE, writeIsLocked: Boolean = false) { | class SmartRWLocker(private val readPermits: Int = Int.MAX_VALUE, writeIsLocked: Boolean = false) { | ||||||
|     private val _readSemaphore = SmartSemaphore.Mutable(permits = readPermits, acquiredPermits = 0) |     private val _readSemaphore = SmartSemaphore.Mutable(permits = readPermits, acquiredPermits = if (writeIsLocked) readPermits else 0) | ||||||
|     private val _writeMutex = SmartMutex.Mutable(locked = writeIsLocked) |     private val _writeMutex = SmartMutex.Mutable(locked = writeIsLocked) | ||||||
|  |  | ||||||
|     val readSemaphore: SmartSemaphore.Immutable = _readSemaphore.immutable() |     val readSemaphore: SmartSemaphore.Immutable = _readSemaphore.immutable() | ||||||
| @@ -23,6 +23,7 @@ class SmartRWLocker(private val readPermits: Int = Int.MAX_VALUE, writeIsLocked: | |||||||
|      * Do lock in [readSemaphore] inside of [writeMutex] locking |      * Do lock in [readSemaphore] inside of [writeMutex] locking | ||||||
|      */ |      */ | ||||||
|     suspend fun acquireRead() { |     suspend fun acquireRead() { | ||||||
|  |         _writeMutex.waitUnlock() | ||||||
|         _readSemaphore.acquire() |         _readSemaphore.acquire() | ||||||
|     } |     } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -45,7 +45,7 @@ sealed interface SmartSemaphore { | |||||||
|      * @param locked Preset state of [freePermits] and its internal [_freePermitsStateFlow] |      * @param locked Preset state of [freePermits] and its internal [_freePermitsStateFlow] | ||||||
|      */ |      */ | ||||||
|     class Mutable(private val permits: Int, acquiredPermits: Int = 0) : SmartSemaphore { |     class Mutable(private val permits: Int, acquiredPermits: Int = 0) : SmartSemaphore { | ||||||
|         private val _freePermitsStateFlow = MutableStateFlow<Int>(permits - acquiredPermits) |         private val _freePermitsStateFlow = SpecialMutableStateFlow<Int>(permits - acquiredPermits) | ||||||
|         override val permitsStateFlow: StateFlow<Int> = _freePermitsStateFlow.asStateFlow() |         override val permitsStateFlow: StateFlow<Int> = _freePermitsStateFlow.asStateFlow() | ||||||
|  |  | ||||||
|         private val internalChangesMutex = Mutex(false) |         private val internalChangesMutex = Mutex(false) | ||||||
|   | |||||||
| @@ -0,0 +1,70 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlinx.coroutines.CoroutineScope | ||||||
|  | import kotlinx.coroutines.Dispatchers | ||||||
|  | import kotlinx.coroutines.ExperimentalCoroutinesApi | ||||||
|  | import kotlinx.coroutines.InternalCoroutinesApi | ||||||
|  | import kotlinx.coroutines.channels.BufferOverflow | ||||||
|  | import kotlinx.coroutines.flow.FlowCollector | ||||||
|  | import kotlinx.coroutines.flow.MutableSharedFlow | ||||||
|  | import kotlinx.coroutines.flow.MutableStateFlow | ||||||
|  | import kotlinx.coroutines.flow.StateFlow | ||||||
|  | import kotlinx.coroutines.internal.SynchronizedObject | ||||||
|  | import kotlinx.coroutines.internal.synchronized | ||||||
|  | import kotlin.coroutines.CoroutineContext | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Works like [StateFlow], but guarantee that latest value update will always be delivered to | ||||||
|  |  * each active subscriber | ||||||
|  |  */ | ||||||
|  | open class SpecialMutableStateFlow<T>( | ||||||
|  |     initialValue: T | ||||||
|  | ) : MutableStateFlow<T>, FlowCollector<T>, MutableSharedFlow<T> { | ||||||
|  |     @OptIn(InternalCoroutinesApi::class) | ||||||
|  |     private val syncObject = SynchronizedObject() | ||||||
|  |     protected val sharingFlow: MutableSharedFlow<T> = MutableSharedFlow( | ||||||
|  |         replay = 1, | ||||||
|  |         extraBufferCapacity = 1, | ||||||
|  |         onBufferOverflow = BufferOverflow.DROP_OLDEST | ||||||
|  |     ) | ||||||
|  |  | ||||||
|  |     @OptIn(InternalCoroutinesApi::class) | ||||||
|  |     override var value: T = initialValue | ||||||
|  |         set(value) { | ||||||
|  |             synchronized(syncObject) { | ||||||
|  |                 if (field != value) { | ||||||
|  |                     field = value | ||||||
|  |                     sharingFlow.tryEmit(value) | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |     override val replayCache: List<T> | ||||||
|  |         get() = sharingFlow.replayCache | ||||||
|  |     override val subscriptionCount: StateFlow<Int> | ||||||
|  |         get() = sharingFlow.subscriptionCount | ||||||
|  |  | ||||||
|  |     init { | ||||||
|  |         sharingFlow.tryEmit(initialValue) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override fun compareAndSet(expect: T, update: T): Boolean { | ||||||
|  |         if (expect == value) { | ||||||
|  |             value = update | ||||||
|  |         } | ||||||
|  |         return expect == value | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     @ExperimentalCoroutinesApi | ||||||
|  |     override fun resetReplayCache() = sharingFlow.resetReplayCache() | ||||||
|  |  | ||||||
|  |     override fun tryEmit(value: T): Boolean { | ||||||
|  |         return compareAndSet(this.value, value) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun emit(value: T) { | ||||||
|  |         compareAndSet(this.value, value) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun collect(collector: FlowCollector<T>) = sharingFlow.collect(collector) | ||||||
|  | } | ||||||
| @@ -10,8 +10,12 @@ fun CoroutineScope.LinkedSupervisorJob( | |||||||
|     additionalContext: CoroutineContext? = null |     additionalContext: CoroutineContext? = null | ||||||
| ) = coroutineContext.LinkedSupervisorJob(additionalContext) | ) = coroutineContext.LinkedSupervisorJob(additionalContext) | ||||||
|  |  | ||||||
| fun CoroutineScope.LinkedSupervisorScope( |  | ||||||
|  | fun CoroutineContext.LinkedSupervisorScope( | ||||||
|     additionalContext: CoroutineContext? = null |     additionalContext: CoroutineContext? = null | ||||||
| ) = CoroutineScope( | ) = CoroutineScope( | ||||||
|     coroutineContext + LinkedSupervisorJob(additionalContext) |     this + LinkedSupervisorJob(additionalContext) | ||||||
| ) | ) | ||||||
|  | fun CoroutineScope.LinkedSupervisorScope( | ||||||
|  |     additionalContext: CoroutineContext? = null | ||||||
|  | ) = coroutineContext.LinkedSupervisorScope(additionalContext) | ||||||
|   | |||||||
| @@ -4,28 +4,71 @@ import kotlinx.coroutines.* | |||||||
| import kotlin.coroutines.CoroutineContext | import kotlin.coroutines.CoroutineContext | ||||||
| import kotlin.coroutines.EmptyCoroutineContext | import kotlin.coroutines.EmptyCoroutineContext | ||||||
|  |  | ||||||
| private fun CoroutineScope.createWeakSubScope() = CoroutineScope(coroutineContext.minusKey(Job)).also { newScope -> | /** | ||||||
|     coroutineContext.job.invokeOnCompletion { newScope.cancel() } |  * Created [CoroutineScope] which will [launch] listening of [context] job completing and drop itself. Current weak | ||||||
|  |  * scope **will not** be attached to [context] directly. So, this [CoroutineScope] will not prevent parent one from | ||||||
|  |  * cancelling if it is launched with [supervisorScope] or [coroutineScope], but still will follow closing status | ||||||
|  |  * of parent [Job] | ||||||
|  |  */ | ||||||
|  | fun WeakScope( | ||||||
|  |     context: CoroutineContext | ||||||
|  | ) = CoroutineScope(context.minusKey(Job) + Job()).also { newScope -> | ||||||
|  |     newScope.launch { | ||||||
|  |         context.job.join() | ||||||
|  |         newScope.cancel() | ||||||
|  |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| fun CoroutineScope.weakLaunch( | /** | ||||||
|  |  * Created [CoroutineScope] which will [launch] listening of [scope] [CoroutineContext] job completing and drop itself. Current weak | ||||||
|  |  * scope **will not** be attached to [scope] [CoroutineContext] directly. So, this [CoroutineScope] will not prevent parent one from | ||||||
|  |  * cancelling if it is launched with [supervisorScope] or [coroutineScope], but still will follow closing status | ||||||
|  |  * of parent [Job] | ||||||
|  |  */ | ||||||
|  | fun WeakScope( | ||||||
|  |     scope: CoroutineScope | ||||||
|  | ) = WeakScope(scope.coroutineContext) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * [this] [CoroutineScope] will be used as base for [WeakScope]. Other parameters ([context], [start], [block]) | ||||||
|  |  * will be used to [launch] [Job] | ||||||
|  |  */ | ||||||
|  | fun CoroutineScope.launchWeak( | ||||||
|     context: CoroutineContext = EmptyCoroutineContext, |     context: CoroutineContext = EmptyCoroutineContext, | ||||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, |     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||||
|     block: suspend CoroutineScope.() -> Unit |     block: suspend CoroutineScope.() -> Unit | ||||||
| ): Job { | ): Job { | ||||||
|     val scope = createWeakSubScope() |     val scope = WeakScope(this) | ||||||
|     val job = scope.launch(context, start, block) |     val job = scope.launch(context, start, block) | ||||||
|     job.invokeOnCompletion { scope.cancel() } |     job.invokeOnCompletion { scope.cancel() } | ||||||
|     return job |     return job | ||||||
| } | } | ||||||
|  |  | ||||||
| fun <T> CoroutineScope.weakAsync( | /** | ||||||
|  |  * [this] [CoroutineScope] will be used as base for [WeakScope]. Other parameters ([context], [start], [block]) | ||||||
|  |  * will be used to create [async] [Deferred] | ||||||
|  |  */ | ||||||
|  | fun <T> CoroutineScope.asyncWeak( | ||||||
|     context: CoroutineContext = EmptyCoroutineContext, |     context: CoroutineContext = EmptyCoroutineContext, | ||||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, |     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||||
|     block: suspend CoroutineScope.() -> T |     block: suspend CoroutineScope.() -> T | ||||||
| ): Deferred<T> { | ): Deferred<T> { | ||||||
|     val scope = createWeakSubScope() |     val scope = WeakScope(this) | ||||||
|     val deferred = scope.async(context, start, block) |     val deferred = scope.async(context, start, block) | ||||||
|     deferred.invokeOnCompletion { scope.cancel() } |     deferred.invokeOnCompletion { scope.cancel() } | ||||||
|     return deferred |     return deferred | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @Deprecated("Renamed", ReplaceWith("launchWeak(context, start, block)", "dev.inmo.micro_utils.coroutines.launchWeak")) | ||||||
|  | fun CoroutineScope.weakLaunch( | ||||||
|  |     context: CoroutineContext = EmptyCoroutineContext, | ||||||
|  |     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||||
|  |     block: suspend CoroutineScope.() -> Unit | ||||||
|  | ): Job = launchWeak(context, start, block) | ||||||
|  |  | ||||||
|  | @Deprecated("Renamed", ReplaceWith("asyncWeak(context, start, block)", "dev.inmo.micro_utils.coroutines.asyncWeak")) | ||||||
|  | fun <T> CoroutineScope.weakAsync( | ||||||
|  |     context: CoroutineContext = EmptyCoroutineContext, | ||||||
|  |     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||||
|  |     block: suspend CoroutineScope.() -> T | ||||||
|  | ): Deferred<T> = asyncWeak(context, start, block) | ||||||
|   | |||||||
							
								
								
									
										42
									
								
								coroutines/src/commonTest/kotlin/DebouncedByTests.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										42
									
								
								coroutines/src/commonTest/kotlin/DebouncedByTests.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,42 @@ | |||||||
|  | import dev.inmo.micro_utils.coroutines.debouncedBy | ||||||
|  | import kotlinx.coroutines.flow.asFlow | ||||||
|  | import kotlinx.coroutines.test.runTest | ||||||
|  | import kotlin.test.Test | ||||||
|  | import kotlin.test.assertEquals | ||||||
|  | import kotlin.test.assertTrue | ||||||
|  |  | ||||||
|  | class DebouncedByTests { | ||||||
|  |     @Test | ||||||
|  |     fun testThatParallelDebouncingWorksCorrectly() = runTest { | ||||||
|  |         val dataToMarkerFactories = listOf( | ||||||
|  |             1 to 0, | ||||||
|  |             2 to 1, | ||||||
|  |             3 to 2, | ||||||
|  |             4 to 0, | ||||||
|  |             5 to 1, | ||||||
|  |             6 to 2, | ||||||
|  |             7 to 0, | ||||||
|  |             8 to 1, | ||||||
|  |             9 to 2, | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |         val collected = mutableListOf<Int>() | ||||||
|  |  | ||||||
|  |         dataToMarkerFactories.asFlow().debouncedBy(10L) { | ||||||
|  |             it.second | ||||||
|  |         }.collect { | ||||||
|  |             when (it.second) { | ||||||
|  |                 0 -> assertEquals(7, it.first) | ||||||
|  |                 1 -> assertEquals(8, it.first) | ||||||
|  |                 2 -> assertEquals(9, it.first) | ||||||
|  |                 else -> error("wtf") | ||||||
|  |             } | ||||||
|  |             collected.add(it.first) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         val expectedList = listOf(7, 8, 9) | ||||||
|  |         assertEquals(expectedList, collected) | ||||||
|  |         assertTrue { collected.containsAll(expectedList) } | ||||||
|  |         assertTrue { expectedList.containsAll(collected) } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,33 @@ | |||||||
|  | import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow | ||||||
|  | import dev.inmo.micro_utils.coroutines.asDeferred | ||||||
|  | import dev.inmo.micro_utils.coroutines.subscribe | ||||||
|  | import kotlinx.coroutines.Job | ||||||
|  | import kotlinx.coroutines.flow.first | ||||||
|  | import kotlinx.coroutines.test.runTest | ||||||
|  | import kotlin.test.Test | ||||||
|  | import kotlin.test.assertEquals | ||||||
|  | import kotlin.test.assertTrue | ||||||
|  |  | ||||||
|  | class SpecialMutableStateFlowTests { | ||||||
|  |     @Test | ||||||
|  |     fun simpleTest() = runTest { | ||||||
|  |         val specialMutableStateFlow = SpecialMutableStateFlow(0) | ||||||
|  |         specialMutableStateFlow.value = 1 | ||||||
|  |         specialMutableStateFlow.first { it == 1 } | ||||||
|  |         assertEquals(1, specialMutableStateFlow.value) | ||||||
|  |     } | ||||||
|  |     @Test | ||||||
|  |     fun specialTest() = runTest { | ||||||
|  |         val specialMutableStateFlow = SpecialMutableStateFlow(0) | ||||||
|  |         lateinit var subscriberJob: Job | ||||||
|  |         subscriberJob = specialMutableStateFlow.subscribe(this) { | ||||||
|  |             when (it) { | ||||||
|  |                 1 -> specialMutableStateFlow.value = 2 | ||||||
|  |                 2 -> subscriberJob.cancel() | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         specialMutableStateFlow.value = 1 | ||||||
|  |         subscriberJob.join() | ||||||
|  |         assertEquals(2, specialMutableStateFlow.value) | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										64
									
								
								coroutines/src/commonTest/kotlin/WeakJobTests.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										64
									
								
								coroutines/src/commonTest/kotlin/WeakJobTests.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,64 @@ | |||||||
|  | import dev.inmo.micro_utils.coroutines.asyncWeak | ||||||
|  | import dev.inmo.micro_utils.coroutines.launchWeak | ||||||
|  | import kotlinx.coroutines.* | ||||||
|  | import kotlinx.coroutines.test.runTest | ||||||
|  | import kotlin.test.Test | ||||||
|  | import kotlin.test.assertTrue | ||||||
|  |  | ||||||
|  | class WeakJobTests { | ||||||
|  |     @Test | ||||||
|  |     fun testWeakJob() = runTest { | ||||||
|  |         var commonJobDone = false | ||||||
|  |         var weakJobStarted = false | ||||||
|  |         try { | ||||||
|  |             coroutineScope { | ||||||
|  |                 launch { | ||||||
|  |                     delay(1000) | ||||||
|  |                     commonJobDone = true | ||||||
|  |                 } | ||||||
|  |                 asyncWeak { | ||||||
|  |                     weakJobStarted = true | ||||||
|  |                     delay(100500L) | ||||||
|  |                     error("This must never happen") | ||||||
|  |                 } | ||||||
|  |             }.await() | ||||||
|  |         } catch (error: Throwable) { | ||||||
|  |             assertTrue(error is CancellationException) | ||||||
|  |             assertTrue(commonJobDone) | ||||||
|  |             assertTrue(weakJobStarted) | ||||||
|  |             return@runTest | ||||||
|  |         } | ||||||
|  |         error("Cancellation exception has not been thrown") | ||||||
|  |     } | ||||||
|  |     @Test | ||||||
|  |     fun testThatWeakJobsWorksCorrectly() = runTest { | ||||||
|  |         val scope = CoroutineScope(Dispatchers.Default) | ||||||
|  |         lateinit var weakLaunchJob: Job | ||||||
|  |         lateinit var weakAsyncJob: Job | ||||||
|  |         val completeDeferred = Job() | ||||||
|  |         coroutineScope { | ||||||
|  |             weakLaunchJob = launchWeak { | ||||||
|  |                 while (isActive) { | ||||||
|  |                     delay(100L) | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             weakAsyncJob = asyncWeak { | ||||||
|  |                 while (isActive) { | ||||||
|  |                     delay(100L) | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             coroutineContext.job.invokeOnCompletion { | ||||||
|  |                 scope.launch { | ||||||
|  |                     delay(1000L) | ||||||
|  |                     completeDeferred.complete() | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             launch { delay(1000L); cancel() } | ||||||
|  |         } | ||||||
|  |         completeDeferred.join() | ||||||
|  |  | ||||||
|  |         assertTrue(!weakLaunchJob.isActive) | ||||||
|  |         assertTrue(!weakAsyncJob.isActive) | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -1,40 +0,0 @@ | |||||||
| package dev.inmo.micro_utils.coroutines |  | ||||||
|  |  | ||||||
| import kotlinx.coroutines.* |  | ||||||
| import org.junit.Test |  | ||||||
|  |  | ||||||
| class WeakJob { |  | ||||||
|     @Test |  | ||||||
|     fun `test that weak jobs works correctly`() { |  | ||||||
|         val scope = CoroutineScope(Dispatchers.Default) |  | ||||||
|         lateinit var weakLaunchJob: Job |  | ||||||
|         lateinit var weakAsyncJob: Job |  | ||||||
|         scope.launchSynchronously { |  | ||||||
|             val completeDeferred = Job() |  | ||||||
|             coroutineScope { |  | ||||||
|                 weakLaunchJob = weakLaunch { |  | ||||||
|                     while (isActive) { |  | ||||||
|                         delay(100L) |  | ||||||
|                     } |  | ||||||
|                 } |  | ||||||
|                 weakAsyncJob = weakAsync { |  | ||||||
|                     while (isActive) { |  | ||||||
|                         delay(100L) |  | ||||||
|                     } |  | ||||||
|                 } |  | ||||||
|  |  | ||||||
|                 coroutineContext.job.invokeOnCompletion { |  | ||||||
|                     scope.launch { |  | ||||||
|                         delay(1000L) |  | ||||||
|                         completeDeferred.complete() |  | ||||||
|                     } |  | ||||||
|                 } |  | ||||||
|                 launch { delay(1000L); cancel() } |  | ||||||
|             } |  | ||||||
|             completeDeferred.join() |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         assert(!weakLaunchJob.isActive) |  | ||||||
|         assert(!weakAsyncJob.isActive) |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppProjectWithSerializationPresetPath" | apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -130,4 +130,4 @@ tasks.dokkaHtml { | |||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$defaultAndroidSettingsPresetPath" | apply from: "$defaultAndroidSettings" | ||||||
|   | |||||||
| @@ -1,34 +1,32 @@ | |||||||
| allprojects { | File templatesFolder = new File("$rootProject.projectDir.absolutePath${File.separatorChar}gradle${File.separatorChar}templates") | ||||||
|     ext { |  | ||||||
|         projectByName = { name -> | Map properties = new HashMap<String, String>() | ||||||
|  |  | ||||||
|  | if (templatesFolder.exists() && templatesFolder.isDirectory()) { | ||||||
|  |     templatesFolder.listFiles().each { | ||||||
|  |         properties[it.name - ".gradle"] = it.absolutePath | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | properties["projectByName"] = { name -> | ||||||
|     for (subproject in rootProject.subprojects) { |     for (subproject in rootProject.subprojects) { | ||||||
|         if (subproject.name == name) { |         if (subproject.name == name) { | ||||||
|             return subproject |             return subproject | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|     return null |     return null | ||||||
|         } | } | ||||||
|  |  | ||||||
|         internalProject = { name -> | properties["internalProject"] = { name -> | ||||||
| //            if (releaseMode) { |  | ||||||
| //                "$group:$name:$version" |  | ||||||
| //            } else { |  | ||||||
| //                projectByName("$name") |  | ||||||
| //            } |  | ||||||
|     projectByName("$name") |     projectByName("$name") | ||||||
|         } | } | ||||||
|  |  | ||||||
|  | allprojects { | ||||||
|  |     ext { | ||||||
|         releaseMode = (project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true" |         releaseMode = (project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true" | ||||||
|  |  | ||||||
|         mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle" |         properties.forEach { k, v -> | ||||||
|         mppProjectWithSerializationAndComposePresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerializationAndCompose.gradle" |             it[k] = v | ||||||
|         mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle" |         } | ||||||
|         mppJvmJsLinuxMingwProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsLinuxMingwProject.gradle" |  | ||||||
|         mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle" |  | ||||||
|  |  | ||||||
|         defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle" |  | ||||||
|  |  | ||||||
|         publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle" |  | ||||||
|         publishJvmOnlyPath = "${rootProject.projectDir.absolutePath}/jvm.publish.gradle" |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppProjectWithSerializationPresetPath" | apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -1,7 +1,6 @@ | |||||||
| package dev.inmo.micro_utils.fsm.common | package dev.inmo.micro_utils.fsm.common | ||||||
|  |  | ||||||
| import dev.inmo.micro_utils.common.Optional | import dev.inmo.micro_utils.common.Optional | ||||||
| import dev.inmo.micro_utils.common.onPresented |  | ||||||
| import dev.inmo.micro_utils.coroutines.* | import dev.inmo.micro_utils.coroutines.* | ||||||
| import dev.inmo.micro_utils.fsm.common.utils.StateHandlingErrorHandler | import dev.inmo.micro_utils.fsm.common.utils.StateHandlingErrorHandler | ||||||
| import dev.inmo.micro_utils.fsm.common.utils.defaultStateHandlingErrorHandler | import dev.inmo.micro_utils.fsm.common.utils.defaultStateHandlingErrorHandler | ||||||
| @@ -118,15 +117,17 @@ open class DefaultStatesMachine <T: State>( | |||||||
|      * [launchStateHandling] will returns some [State] then [statesManager] [StatesManager.update] will be used, otherwise |      * [launchStateHandling] will returns some [State] then [statesManager] [StatesManager.update] will be used, otherwise | ||||||
|      * [StatesManager.endChain]. |      * [StatesManager.endChain]. | ||||||
|      */ |      */ | ||||||
|     override fun start(scope: CoroutineScope): Job = scope.launchSafelyWithoutExceptions { |     override fun start(scope: CoroutineScope): Job { | ||||||
|         (statesManager.getActiveStates().asFlow() + statesManager.onStartChain).subscribeSafelyWithoutExceptions(this) { |         val supervisorScope = scope.LinkedSupervisorScope() | ||||||
|             launch { performStateUpdate(Optional.absent(), it, scope.LinkedSupervisorScope()) } |         supervisorScope.launchSafelyWithoutExceptions { | ||||||
|  |             (statesManager.getActiveStates().asFlow() + statesManager.onStartChain).subscribeSafelyWithoutExceptions(supervisorScope) { | ||||||
|  |                 supervisorScope.launch { performStateUpdate(Optional.absent(), it, supervisorScope) } | ||||||
|             } |             } | ||||||
|         statesManager.onChainStateUpdated.subscribeSafelyWithoutExceptions(this) { |             statesManager.onChainStateUpdated.subscribeSafelyWithoutExceptions(supervisorScope) { | ||||||
|             launch { performStateUpdate(Optional.presented(it.first), it.second, scope.LinkedSupervisorScope()) } |                 supervisorScope.launch { performStateUpdate(Optional.presented(it.first), it.second, supervisorScope) } | ||||||
|             } |             } | ||||||
|         statesManager.onEndChain.subscribeSafelyWithoutExceptions(this) { removedState -> |             statesManager.onEndChain.subscribeSafelyWithoutExceptions(supervisorScope) { removedState -> | ||||||
|             launch { |                 supervisorScope.launch { | ||||||
|                     statesJobsMutex.withLock { |                     statesJobsMutex.withLock { | ||||||
|                         val stateInMap = statesJobs.keys.firstOrNull { stateInMap -> stateInMap == removedState } |                         val stateInMap = statesJobs.keys.firstOrNull { stateInMap -> stateInMap == removedState } | ||||||
|                         if (stateInMap === removedState) { |                         if (stateInMap === removedState) { | ||||||
| @@ -137,6 +138,9 @@ open class DefaultStatesMachine <T: State>( | |||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  |         return supervisorScope.coroutineContext.job | ||||||
|  |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * Just calls [StatesManager.startChain] of [statesManager] |      * Just calls [StatesManager.startChain] of [statesManager] | ||||||
|      */ |      */ | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppProjectWithSerializationPresetPath" | apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -18,13 +18,13 @@ if (new File(projectDir, "secret.gradle").exists()) { | |||||||
|     githubRelease { |     githubRelease { | ||||||
|         token "${project.property('GITHUB_RELEASE_TOKEN')}" |         token "${project.property('GITHUB_RELEASE_TOKEN')}" | ||||||
|  |  | ||||||
|         owner "InsanusMokrassar" |         owner = "InsanusMokrassar" | ||||||
|         repo "MicroUtils" |         repo = "MicroUtils" | ||||||
|  |  | ||||||
|         tagName "v${project.version}" |         tagName = "v${project.version}" | ||||||
|         releaseName "${project.version}" |         releaseName = "${project.version}" | ||||||
|         targetCommitish "${project.version}" |         targetCommitish = "${project.version}" | ||||||
|  |  | ||||||
|         body getCurrentVersionChangelog() |         body = getCurrentVersionChangelog() | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ kotlin.incremental.js=true | |||||||
| #kotlin.experimental.tryK2=true | #kotlin.experimental.tryK2=true | ||||||
| android.useAndroidX=true | android.useAndroidX=true | ||||||
| android.enableJetifier=true | android.enableJetifier=true | ||||||
| org.gradle.jvmargs=-Xmx2g | org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=2g | ||||||
|  |  | ||||||
| # JS NPM | # JS NPM | ||||||
|  |  | ||||||
| @@ -15,5 +15,5 @@ crypto_js_version=4.1.1 | |||||||
| # Project data | # Project data | ||||||
|  |  | ||||||
| group=dev.inmo | group=dev.inmo | ||||||
| version=0.20.5 | version=0.22.6 | ||||||
| android_code_version=211 | android_code_version=272 | ||||||
|   | |||||||
| @@ -1,45 +1,47 @@ | |||||||
| [versions] | [versions] | ||||||
|  |  | ||||||
| kt = "1.9.10" | kt = "2.0.20" | ||||||
| kt-serialization = "1.6.0" | kt-serialization = "1.7.3" | ||||||
| kt-coroutines = "1.7.3" | kt-coroutines = "1.9.0" | ||||||
|  |  | ||||||
| kslog = "1.2.1" | kslog = "1.3.6" | ||||||
|  |  | ||||||
| jb-compose = "1.5.1" | jb-compose = "1.7.0-rc01" | ||||||
| jb-exposed = "0.43.0" | jb-exposed = "0.55.0" | ||||||
| jb-dokka = "1.9.0" | jb-dokka = "1.9.20" | ||||||
|  |  | ||||||
| korlibs = "4.0.10" | sqlite = "3.46.1.3" | ||||||
| uuid = "0.8.1" |  | ||||||
|  |  | ||||||
| ktor = "2.3.4" | korlibs = "5.4.0" | ||||||
|  | uuid = "0.8.4" | ||||||
|  |  | ||||||
| gh-release = "2.4.1" | ktor = "2.3.12" | ||||||
|  |  | ||||||
| koin = "3.4.3" | gh-release = "2.5.2" | ||||||
|  |  | ||||||
| okio = "3.5.0" | koin = "4.0.0" | ||||||
|  |  | ||||||
| ksp = "1.9.10-1.0.13" | okio = "3.9.1" | ||||||
| kotlin-poet = "1.14.2" |  | ||||||
|  |  | ||||||
| versions = "0.47.0" | ksp = "2.0.20-1.0.25" | ||||||
|  | kotlin-poet = "1.18.1" | ||||||
|  |  | ||||||
| android-gradle = "7.4.2" | versions = "0.51.0" | ||||||
|  |  | ||||||
|  | android-gradle = "8.2.2" | ||||||
| dexcount = "4.0.0" | dexcount = "4.0.0" | ||||||
|  |  | ||||||
| android-coreKtx = "1.10.1" | android-coreKtx = "1.13.1" | ||||||
| android-recyclerView = "1.3.1" | android-recyclerView = "1.3.2" | ||||||
| android-appCompat = "1.6.1" | android-appCompat = "1.7.0" | ||||||
| android-fragment = "1.6.1" | android-fragment = "1.8.4" | ||||||
| android-espresso = "3.5.1" | android-espresso = "3.6.1" | ||||||
| android-test = "1.1.5" | android-test = "1.2.1" | ||||||
| android-compose-material3 = "1.1.1" | android-compose-material3 = "1.3.0" | ||||||
|  |  | ||||||
| android-props-minSdk = "21" | android-props-minSdk = "21" | ||||||
| android-props-compileSdk = "34" | android-props-compileSdk = "35" | ||||||
| android-props-buildTools = "34.0.0" | android-props-buildTools = "35.0.0" | ||||||
|  |  | ||||||
| [libraries] | [libraries] | ||||||
|  |  | ||||||
| @@ -52,6 +54,7 @@ kt-serialization-cbor = { module = "org.jetbrains.kotlinx:kotlinx-serialization- | |||||||
| kt-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kt-coroutines" } | kt-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kt-coroutines" } | ||||||
| kt-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kt-coroutines" } | kt-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kt-coroutines" } | ||||||
| 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" } | ||||||
|  |  | ||||||
|  |  | ||||||
| ktor-io = { module = "io.ktor:ktor-io", version.ref = "ktor" } | ktor-io = { module = "io.ktor:ktor-io", version.ref = "ktor" } | ||||||
| @@ -72,19 +75,21 @@ ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negoti | |||||||
|  |  | ||||||
| kslog = { module = "dev.inmo:kslog", version.ref = "kslog" } | kslog = { module = "dev.inmo:kslog", version.ref = "kslog" } | ||||||
|  |  | ||||||
| klock = { module = "com.soywiz.korlibs.klock:klock", version.ref = "korlibs" } | klock = { module = "com.soywiz.korge:korlibs-time", version.ref = "korlibs" } | ||||||
| krypto = { module = "com.soywiz.korlibs.krypto:krypto", version.ref = "korlibs" } | krypto = { module = "com.soywiz.korge:korlibs-crypto", version.ref = "korlibs" } | ||||||
| uuid = { module = "com.benasher44:uuid", version.ref = "uuid" } | uuid = { module = "com.benasher44:uuid", version.ref = "uuid" } | ||||||
| koin = { module = "io.insert-koin:koin-core", version.ref = "koin" } | koin = { module = "io.insert-koin:koin-core", version.ref = "koin" } | ||||||
|  |  | ||||||
|  |  | ||||||
| jb-exposed = { module = "org.jetbrains.exposed:exposed-core", version.ref = "jb-exposed" } | jb-exposed = { module = "org.jetbrains.exposed:exposed-core", version.ref = "jb-exposed" } | ||||||
|  | jb-exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "jb-exposed" } | ||||||
|  | sqlite = { module = "org.xerial:sqlite-jdbc", version.ref = "sqlite" } | ||||||
|  |  | ||||||
|  | jb-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "jb-compose" } | ||||||
|  |  | ||||||
| android-coreKtx = { module = "androidx.core:core-ktx", version.ref = "android-coreKtx" } | android-coreKtx = { module = "androidx.core:core-ktx", version.ref = "android-coreKtx" } | ||||||
| android-recyclerView = { module = "androidx.recyclerview:recyclerview", version.ref = "android-recyclerView" } | android-recyclerView = { module = "androidx.recyclerview:recyclerview", version.ref = "android-recyclerView" } | ||||||
| android-appCompat-resources = { module = "androidx.appcompat:appcompat-resources", version.ref = "android-appCompat" } | android-appCompat-resources = { module = "androidx.appcompat:appcompat-resources", version.ref = "android-appCompat" } | ||||||
| android-compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "android-compose-material3" } |  | ||||||
| android-fragment = { module = "androidx.fragment:fragment", version.ref = "android-fragment" } | android-fragment = { module = "androidx.fragment:fragment", version.ref = "android-fragment" } | ||||||
| android-espresso = { module = "androidx.test.espresso:espresso-core", version.ref = "android-espresso" } | android-espresso = { module = "androidx.test.espresso:espresso-core", version.ref = "android-espresso" } | ||||||
| android-test-junit = { module = "androidx.test.ext:junit", version.ref = "android-test" } | android-test-junit = { module = "androidx.test.ext:junit", version.ref = "android-test" } | ||||||
| @@ -113,5 +118,6 @@ buildscript-android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gra | |||||||
| [plugins] | [plugins] | ||||||
|  |  | ||||||
| jb-compose = { id = "org.jetbrains.compose", version.ref = "jb-compose" } | jb-compose = { id = "org.jetbrains.compose", version.ref = "jb-compose" } | ||||||
|  | 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" } | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ android { | |||||||
| 
 | 
 | ||||||
|     defaultConfig { |     defaultConfig { | ||||||
|         minSdkVersion libs.versions.android.props.minSdk.get().toInteger() |         minSdkVersion libs.versions.android.props.minSdk.get().toInteger() | ||||||
|  |         compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger() | ||||||
|         targetSdkVersion libs.versions.android.props.compileSdk.get().toInteger() |         targetSdkVersion libs.versions.android.props.compileSdk.get().toInteger() | ||||||
|         versionCode "${android_code_version}".toInteger() |         versionCode "${android_code_version}".toInteger() | ||||||
|         versionName "$version" |         versionName "$version" | ||||||
| @@ -27,7 +28,7 @@ android { | |||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     compileOptions { |     compileOptions { | ||||||
|         sourceCompatibility JavaVersion.VERSION_1_8 |         sourceCompatibility JavaVersion.VERSION_17 | ||||||
|         targetCompatibility JavaVersion.VERSION_1_8 |         targetCompatibility JavaVersion.VERSION_17 | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @@ -1,11 +1,16 @@ | |||||||
| project.version = "$version" | project.version = "$version" | ||||||
| project.group = "$group" | project.group = "$group" | ||||||
| 
 | 
 | ||||||
| apply from: "$publishGradlePath" | apply from: "$publish" | ||||||
| 
 | 
 | ||||||
| kotlin { | kotlin { | ||||||
|     android { |     androidTarget { | ||||||
|         publishAllLibraryVariants() |         publishAllLibraryVariants() | ||||||
|  |         compilations.all { | ||||||
|  |             kotlinOptions { | ||||||
|  |                 jvmTarget = "17" | ||||||
|  |             } | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     sourceSets { |     sourceSets { | ||||||
| @@ -24,9 +29,9 @@ kotlin { | |||||||
|     } |     } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| apply from: "$defaultAndroidSettingsPresetPath" | apply from: "$defaultAndroidSettings" | ||||||
| 
 | 
 | ||||||
| java { | java { | ||||||
|     sourceCompatibility = JavaVersion.VERSION_1_8 |     sourceCompatibility = JavaVersion.VERSION_17 | ||||||
|     targetCompatibility = JavaVersion.VERSION_1_8 |     targetCompatibility = JavaVersion.VERSION_17 | ||||||
| } | } | ||||||
| @@ -0,0 +1,108 @@ | |||||||
|  | project.version = "$version" | ||||||
|  | project.group = "$group" | ||||||
|  |  | ||||||
|  | apply from: "$publish" | ||||||
|  |  | ||||||
|  | kotlin { | ||||||
|  |     jvm { | ||||||
|  |         compilations.main { | ||||||
|  |             kotlinOptions { | ||||||
|  |                 jvmTarget = "17" | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     js (IR) { | ||||||
|  |         browser { | ||||||
|  |             testTask { | ||||||
|  |                 useMocha { | ||||||
|  |                     timeout = "60000" | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         nodejs { | ||||||
|  |             testTask { | ||||||
|  |                 useMocha { | ||||||
|  |                     timeout = "60000" | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     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 | ||||||
|  | } | ||||||
| @@ -1,13 +1,13 @@ | |||||||
| project.version = "$version" | project.version = "$version" | ||||||
| project.group = "$group" | project.group = "$group" | ||||||
| 
 | 
 | ||||||
| apply from: "$publishGradlePath" | apply from: "$publish" | ||||||
| 
 | 
 | ||||||
| kotlin { | kotlin { | ||||||
|     jvm { |     jvm { | ||||||
|         compilations.main { |         compilations.main { | ||||||
|             kotlinOptions { |             kotlinOptions { | ||||||
|                 jvmTarget = "1.8" |                 jvmTarget = "17" | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| @@ -35,6 +35,6 @@ kotlin { | |||||||
| } | } | ||||||
| 
 | 
 | ||||||
| java { | java { | ||||||
|     sourceCompatibility = JavaVersion.VERSION_1_8 |     sourceCompatibility = JavaVersion.VERSION_17 | ||||||
|     targetCompatibility = JavaVersion.VERSION_1_8 |     targetCompatibility = JavaVersion.VERSION_17 | ||||||
| } | } | ||||||
| @@ -1,25 +1,43 @@ | |||||||
| project.version = "$version" | project.version = "$version" | ||||||
| project.group = "$group" | project.group = "$group" | ||||||
| 
 | 
 | ||||||
| apply from: "$publishGradlePath" | apply from: "$publish" | ||||||
| 
 | 
 | ||||||
| kotlin { | kotlin { | ||||||
|     jvm { |     jvm { | ||||||
|         compilations.main { |         compilations.main { | ||||||
|             kotlinOptions { |             kotlinOptions { | ||||||
|                 jvmTarget = "1.8" |                 jvmTarget = "17" | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|     js (IR) { |     js (IR) { | ||||||
|         browser() |         browser { | ||||||
|         nodejs() |             testTask { | ||||||
|  |                 useMocha { | ||||||
|  |                     timeout = "60000" | ||||||
|                 } |                 } | ||||||
|     android { |             } | ||||||
|  |         } | ||||||
|  |         nodejs { | ||||||
|  |             testTask { | ||||||
|  |                 useMocha { | ||||||
|  |                     timeout = "60000" | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     androidTarget { | ||||||
|         publishAllLibraryVariants() |         publishAllLibraryVariants() | ||||||
|  |         compilations.all { | ||||||
|  |             kotlinOptions { | ||||||
|  |                 jvmTarget = "17" | ||||||
|  |             } | ||||||
|  |         } | ||||||
|     } |     } | ||||||
|     linuxX64() |     linuxX64() | ||||||
|     mingwX64() |     mingwX64() | ||||||
|  |     linuxArm64() | ||||||
| 
 | 
 | ||||||
|     sourceSets { |     sourceSets { | ||||||
|         commonMain { |         commonMain { | ||||||
| @@ -30,11 +48,19 @@ kotlin { | |||||||
|         } |         } | ||||||
|         commonTest { |         commonTest { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 implementation kotlin('test-common') |                 implementation kotlin('test') | ||||||
|                 implementation kotlin('test-annotations-common') |                 implementation kotlin('test-annotations-common') | ||||||
|                 implementation libs.kt.coroutines.test |                 implementation libs.kt.coroutines.test | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  | 
 | ||||||
|  |         androidUnitTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('test-junit') | ||||||
|  |                 implementation libs.android.test.junit | ||||||
|  |                 implementation libs.android.espresso | ||||||
|  |             } | ||||||
|  |         } | ||||||
|         jvmTest { |         jvmTest { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 implementation kotlin('test-junit') |                 implementation kotlin('test-junit') | ||||||
| @@ -43,34 +69,20 @@ kotlin { | |||||||
|         jsTest { |         jsTest { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 implementation kotlin('test-js') |                 implementation kotlin('test-js') | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         androidUnitTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|                 implementation libs.android.test.junit |  | ||||||
|                 implementation libs.android.espresso |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         mingwX64Test { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         linuxX64Test { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |         nativeMain.dependsOn commonMain | ||||||
|  |         linuxX64Main.dependsOn nativeMain | ||||||
|  |         mingwX64Main.dependsOn nativeMain | ||||||
|  |         linuxArm64Main.dependsOn nativeMain | ||||||
| 
 | 
 | ||||||
|         androidMain.dependsOn jvmMain |         androidMain.dependsOn jvmMain | ||||||
|     } |     } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| apply from: "$defaultAndroidSettingsPresetPath" | apply from: "$defaultAndroidSettings" | ||||||
| 
 | 
 | ||||||
| java { | java { | ||||||
|     sourceCompatibility = JavaVersion.VERSION_1_8 |     sourceCompatibility = JavaVersion.VERSION_17 | ||||||
|     targetCompatibility = JavaVersion.VERSION_1_8 |     targetCompatibility = JavaVersion.VERSION_17 | ||||||
| } | } | ||||||
| @@ -1,19 +1,31 @@ | |||||||
| project.version = "$version" | project.version = "$version" | ||||||
| project.group = "$group" | project.group = "$group" | ||||||
| 
 | 
 | ||||||
| apply from: "$publishGradlePath" | apply from: "$publish" | ||||||
| 
 | 
 | ||||||
| kotlin { | kotlin { | ||||||
|     jvm { |     jvm { | ||||||
|         compilations.main { |         compilations.main { | ||||||
|             kotlinOptions { |             kotlinOptions { | ||||||
|                 jvmTarget = "1.8" |                 jvmTarget = "17" | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|     js (IR) { |     js (IR) { | ||||||
|         browser() |         browser { | ||||||
|         nodejs() |             testTask { | ||||||
|  |                 useMocha { | ||||||
|  |                     timeout = "60000" | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         nodejs { | ||||||
|  |             testTask { | ||||||
|  |                 useMocha { | ||||||
|  |                     timeout = "60000" | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|     } |     } | ||||||
|     linuxX64() |     linuxX64() | ||||||
|     mingwX64() |     mingwX64() | ||||||
| @@ -22,6 +34,7 @@ kotlin { | |||||||
|         commonMain { |         commonMain { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 implementation kotlin('stdlib') |                 implementation kotlin('stdlib') | ||||||
|  |                 api libs.kt.serialization | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|         commonTest { |         commonTest { | ||||||
| @@ -40,13 +53,18 @@ kotlin { | |||||||
|         jsTest { |         jsTest { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 implementation kotlin('test-js') |                 implementation kotlin('test-js') | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  | 
 | ||||||
|  |         nativeMain.dependsOn commonMain | ||||||
|  |         linuxX64Main.dependsOn nativeMain | ||||||
|  |         mingwX64Main.dependsOn nativeMain | ||||||
|  | 
 | ||||||
|  |         androidMain.dependsOn jvmMain | ||||||
|     } |     } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| java { | java { | ||||||
|     sourceCompatibility = JavaVersion.VERSION_1_8 |     sourceCompatibility = JavaVersion.VERSION_17 | ||||||
|     targetCompatibility = JavaVersion.VERSION_1_8 |     targetCompatibility = JavaVersion.VERSION_17 | ||||||
| } | } | ||||||
| @@ -1,30 +1,47 @@ | |||||||
| project.version = "$version" | project.version = "$version" | ||||||
| project.group = "$group" | project.group = "$group" | ||||||
| 
 | 
 | ||||||
| apply from: "$publishGradlePath" | apply from: "$publish" | ||||||
| 
 | 
 | ||||||
| kotlin { | kotlin { | ||||||
|     jvm { |     jvm { | ||||||
|         compilations.main { |         compilations.main { | ||||||
|             kotlinOptions { |             kotlinOptions { | ||||||
|                 jvmTarget = "1.8" |                 jvmTarget = "17" | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|     js (IR) { |     js (IR) { | ||||||
|         browser() |         browser { | ||||||
|         nodejs() |             testTask { | ||||||
|  |                 useMocha { | ||||||
|  |                     timeout = "60000" | ||||||
|                 } |                 } | ||||||
|     android { |             } | ||||||
|  |         } | ||||||
|  |         nodejs { | ||||||
|  |             testTask { | ||||||
|  |                 useMocha { | ||||||
|  |                     timeout = "60000" | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     androidTarget { | ||||||
|         publishAllLibraryVariants() |         publishAllLibraryVariants() | ||||||
|  |         compilations.all { | ||||||
|  |             kotlinOptions { | ||||||
|  |                 jvmTarget = "17" | ||||||
|  |             } | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     sourceSets { |     sourceSets { | ||||||
|         commonMain { |         commonMain { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 implementation kotlin('stdlib') |                 implementation kotlin('stdlib') | ||||||
|                 api libs.kt.serialization |  | ||||||
|                 implementation compose.runtime |                 implementation compose.runtime | ||||||
|  |                 api libs.kt.serialization | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|         commonTest { |         commonTest { | ||||||
| @@ -42,6 +59,7 @@ kotlin { | |||||||
|         jvmTest { |         jvmTest { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 implementation kotlin('test-junit') |                 implementation kotlin('test-junit') | ||||||
|  |                 implementation compose.uiTest | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|         jsMain { |         jsMain { | ||||||
| @@ -52,7 +70,6 @@ kotlin { | |||||||
|         jsTest { |         jsTest { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 implementation kotlin('test-js') |                 implementation kotlin('test-js') | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|         androidUnitTest { |         androidUnitTest { | ||||||
| @@ -60,16 +77,22 @@ kotlin { | |||||||
|                 implementation kotlin('test-junit') |                 implementation kotlin('test-junit') | ||||||
|                 implementation libs.android.test.junit |                 implementation libs.android.test.junit | ||||||
|                 implementation libs.android.espresso |                 implementation libs.android.espresso | ||||||
|  |                 implementation compose.uiTest | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
| 
 |  | ||||||
|         androidMain.dependsOn jvmMain |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| apply from: "$defaultAndroidSettingsPresetPath" | apply from: "$defaultAndroidSettings" | ||||||
| 
 | 
 | ||||||
| java { | java { | ||||||
|     sourceCompatibility = JavaVersion.VERSION_1_8 |     sourceCompatibility = JavaVersion.VERSION_17 | ||||||
|     targetCompatibility = JavaVersion.VERSION_1_8 |     targetCompatibility = JavaVersion.VERSION_17 | ||||||
| } | } | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | //compose { | ||||||
|  | //    if (composePluginKotlinVersion != null && !composePluginKotlinVersion.isEmpty()) { | ||||||
|  | //        kotlinCompilerPlugin.set(composePluginKotlinVersion) | ||||||
|  | //    } | ||||||
|  | //} | ||||||
| @@ -1,7 +1,7 @@ | |||||||
| apply plugin: 'maven-publish' | apply plugin: 'maven-publish' | ||||||
| 
 | 
 | ||||||
| task javadocsJar(type: Jar) { | task javadocsJar(type: Jar) { | ||||||
|     classifier = 'javadoc' |     archiveClassifier = 'javadoc' | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| publishing { | publishing { | ||||||
| @@ -57,19 +57,16 @@ publishing { | |||||||
|              |              | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|             if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) { |             if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) { | ||||||
|                 maven { |                 maven { | ||||||
|                     name = "Gitea" |                     name = "InmoNexus" | ||||||
|                     url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven") |                     url = uri("https://nexus.inmo.dev/repository/maven-releases/") | ||||||
|              |              | ||||||
|                     credentials(HttpHeaderCredentials) { |                     credentials { | ||||||
|                         name = "Authorization" |                         username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER') | ||||||
|                         value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN') |                         password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD') | ||||||
|                     } |                     } | ||||||
|              |              | ||||||
|                     authentication { |  | ||||||
|                         header(HttpHeaderAuthentication) |  | ||||||
|                     } |  | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|             if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) { |             if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) { | ||||||
| @@ -102,4 +99,27 @@ if (project.hasProperty("signing.gnupg.keyName")) { | |||||||
|             dependsOn(it) |             dependsOn(it) | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  | 
 | ||||||
|  |     // Workaround to make android sign operations depend on signing tasks | ||||||
|  |     project.getTasks().withType(AbstractPublishToMaven.class).configureEach { | ||||||
|  |         def signingTasks = project.getTasks().withType(Sign.class) | ||||||
|  |         mustRunAfter(signingTasks) | ||||||
|  |     } | ||||||
|  |     // Workaround to make test tasks use sign | ||||||
|  |     project.getTasks().withType(Sign.class).configureEach { signTask -> | ||||||
|  |         def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name) | ||||||
|  |         def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign | ||||||
|  |         // These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets | ||||||
|  | 
 | ||||||
|  |         // Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency | ||||||
|  |         def debugTestTask = tasks.findByName("linkDebugTest$pubName") | ||||||
|  |         if (debugTestTask != null) { | ||||||
|  |             signTask.mustRunAfter(debugTestTask) | ||||||
|  |         } | ||||||
|  |         // Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency | ||||||
|  |         def testTask = tasks.findByName("compileTestKotlin$pubName") | ||||||
|  |         if (testTask != null) { | ||||||
|  |             signTask.mustRunAfter(testTask) | ||||||
|  |         } | ||||||
|  |     } | ||||||
| } | } | ||||||
| @@ -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":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"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://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}} | ||||||
| @@ -2,11 +2,11 @@ apply plugin: 'maven-publish' | |||||||
| 
 | 
 | ||||||
| task javadocJar(type: Jar) { | task javadocJar(type: Jar) { | ||||||
|     from javadoc |     from javadoc | ||||||
|     classifier = 'javadoc' |     archiveClassifier = 'javadoc' | ||||||
| } | } | ||||||
| task sourcesJar(type: Jar) { | task sourcesJar(type: Jar) { | ||||||
|     from sourceSets.main.allSource |     from sourceSets.main.allSource | ||||||
|     classifier = 'sources' |     archiveClassifier = 'sources' | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| publishing { | publishing { | ||||||
| @@ -68,18 +68,14 @@ publishing { | |||||||
|                  |                  | ||||||
|                     } |                     } | ||||||
|                 } |                 } | ||||||
|                 if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) { |                 if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) { | ||||||
|                     maven { |                     maven { | ||||||
|                         name = "Gitea" |                         name = "InmoNexus" | ||||||
|                         url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven") |                         url = uri("https://nexus.inmo.dev/repository/maven-releases/") | ||||||
|                  |                  | ||||||
|                         credentials(HttpHeaderCredentials) { |                         credentials { | ||||||
|                             name = "Authorization" |                             username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER') | ||||||
|                             value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN') |                             password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD') | ||||||
|                         } |  | ||||||
|                  |  | ||||||
|                         authentication { |  | ||||||
|                             header(HttpHeaderAuthentication) |  | ||||||
|                         } |                         } | ||||||
|                  |                  | ||||||
|                     } |                     } | ||||||
| @@ -115,4 +111,27 @@ if (project.hasProperty("signing.gnupg.keyName")) { | |||||||
|             dependsOn(it) |             dependsOn(it) | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  | 
 | ||||||
|  |     // Workaround to make android sign operations depend on signing tasks | ||||||
|  |     project.getTasks().withType(AbstractPublishToMaven.class).configureEach { | ||||||
|  |         def signingTasks = project.getTasks().withType(Sign.class) | ||||||
|  |         mustRunAfter(signingTasks) | ||||||
|  |     } | ||||||
|  |     // Workaround to make test tasks use sign | ||||||
|  |     project.getTasks().withType(Sign.class).configureEach { signTask -> | ||||||
|  |         def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name) | ||||||
|  |         def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign | ||||||
|  |         // These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets | ||||||
|  | 
 | ||||||
|  |         // Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency | ||||||
|  |         def debugTestTask = tasks.findByName("linkDebugTest$pubName") | ||||||
|  |         if (debugTestTask != null) { | ||||||
|  |             signTask.mustRunAfter(debugTestTask) | ||||||
|  |         } | ||||||
|  |         // Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency | ||||||
|  |         def testTask = tasks.findByName("compileTestKotlin$pubName") | ||||||
|  |         if (testTask != null) { | ||||||
|  |             signTask.mustRunAfter(testTask) | ||||||
|  |         } | ||||||
|  |     } | ||||||
| } | } | ||||||
| @@ -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":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"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://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"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-7.6.2-bin.zip | distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-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: "$mppProjectWithSerializationPresetPath" | apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -2,7 +2,7 @@ plugins { | |||||||
|     id "org.jetbrains.kotlin.jvm" |     id "org.jetbrains.kotlin.jvm" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$publishJvmOnlyPath" | apply from: "$publish_jvm" | ||||||
|  |  | ||||||
| repositories { | repositories { | ||||||
|     mavenCentral() |     mavenCentral() | ||||||
| @@ -15,6 +15,6 @@ dependencies { | |||||||
| } | } | ||||||
|  |  | ||||||
| java { | java { | ||||||
|     sourceCompatibility = JavaVersion.VERSION_1_8 |     sourceCompatibility = JavaVersion.VERSION_17 | ||||||
|     targetCompatibility = JavaVersion.VERSION_1_8 |     targetCompatibility = JavaVersion.VERSION_17 | ||||||
| } | } | ||||||
|   | |||||||
| @@ -5,7 +5,7 @@ plugins { | |||||||
|     id "com.google.devtools.ksp" |     id "com.google.devtools.ksp" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppProjectWithSerializationPresetPath" | apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|   | |||||||
							
								
								
									
										7
									
								
								ksp/classcasts/build.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								ksp/classcasts/build.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,7 @@ | |||||||
|  | plugins { | ||||||
|  |     id "org.jetbrains.kotlin.multiplatform" | ||||||
|  |     id "org.jetbrains.kotlin.plugin.serialization" | ||||||
|  |     id "com.android.library" | ||||||
|  | } | ||||||
|  |  | ||||||
|  | apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
							
								
								
									
										21
									
								
								ksp/classcasts/generator/build.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								ksp/classcasts/generator/build.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,21 @@ | |||||||
|  | plugins { | ||||||
|  |     id "org.jetbrains.kotlin.jvm" | ||||||
|  | } | ||||||
|  |  | ||||||
|  | apply from: "$publish_jvm" | ||||||
|  |  | ||||||
|  | repositories { | ||||||
|  |     mavenCentral() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | dependencies { | ||||||
|  |     api project(":micro_utils.ksp.generator") | ||||||
|  |     api project(":micro_utils.ksp.classcasts") | ||||||
|  |     api libs.kotlin.poet | ||||||
|  |     api libs.ksp | ||||||
|  | } | ||||||
|  |  | ||||||
|  | java { | ||||||
|  |     sourceCompatibility = JavaVersion.VERSION_17 | ||||||
|  |     targetCompatibility = JavaVersion.VERSION_17 | ||||||
|  | } | ||||||
							
								
								
									
										90
									
								
								ksp/classcasts/generator/src/main/kotlin/ClassCastsFiller.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										90
									
								
								ksp/classcasts/generator/src/main/kotlin/ClassCastsFiller.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,90 @@ | |||||||
|  | package dev.inmo.micro_utils.ksp.classcasts.generator | ||||||
|  |  | ||||||
|  | import com.google.devtools.ksp.symbol.ClassKind | ||||||
|  | import com.google.devtools.ksp.symbol.KSClassDeclaration | ||||||
|  | import com.squareup.kotlinpoet.* | ||||||
|  | import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy | ||||||
|  | import com.squareup.kotlinpoet.ksp.toClassName | ||||||
|  | import com.squareup.kotlinpoet.ksp.toTypeName | ||||||
|  |  | ||||||
|  |  | ||||||
|  | private fun FileSpec.Builder.addTopLevelImport(className: ClassName) { | ||||||
|  |     className.topLevelClassName().let { | ||||||
|  |         addImport(it.packageName, it.simpleNames) | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | private fun FileSpec.Builder.createTypeDefinition(ksClassDeclaration: KSClassDeclaration): TypeName { | ||||||
|  |     val className = ksClassDeclaration.toClassName() | ||||||
|  |     return if (ksClassDeclaration.typeParameters.isNotEmpty()) { | ||||||
|  |         className.parameterizedBy( | ||||||
|  |             ksClassDeclaration.typeParameters.map { | ||||||
|  |                 it.bounds.first().resolve().also { | ||||||
|  |                     val typeClassName = it.toClassName() | ||||||
|  |                     addTopLevelImport(typeClassName) | ||||||
|  |                 }.toTypeName() | ||||||
|  |             } | ||||||
|  |         ) | ||||||
|  |     } else { | ||||||
|  |         className | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | internal fun FileSpec.Builder.fill( | ||||||
|  |     sourceKSClassDeclaration: KSClassDeclaration, | ||||||
|  |     subtypes: Set<KSClassDeclaration> | ||||||
|  | ) { | ||||||
|  |     subtypes.forEach { targetClassDeclaration -> | ||||||
|  |         val sourceClassName = sourceKSClassDeclaration.toClassName() | ||||||
|  |         val targetClassClassName = targetClassDeclaration.toClassName() | ||||||
|  |         val targetClassTypeDefinition = createTypeDefinition(targetClassDeclaration) | ||||||
|  |         val simpleName = targetClassDeclaration.simpleName.asString() | ||||||
|  |         val withFirstLowerCase = simpleName.replaceFirstChar { it.lowercase() } | ||||||
|  |         val castedOrNullName = "${withFirstLowerCase}OrNull" | ||||||
|  |  | ||||||
|  |         addTopLevelImport(targetClassClassName) | ||||||
|  |         addFunction( | ||||||
|  |             FunSpec.builder(castedOrNullName).apply { | ||||||
|  |                 receiver(sourceClassName) | ||||||
|  |                 addCode( | ||||||
|  |                     "return this as? %L", | ||||||
|  |                     targetClassTypeDefinition | ||||||
|  |                 ) | ||||||
|  |                 returns(targetClassTypeDefinition.copy(nullable = true)) | ||||||
|  |                 addModifiers(KModifier.INLINE) | ||||||
|  |             }.build() | ||||||
|  |         ) | ||||||
|  |         addFunction( | ||||||
|  |             FunSpec.builder("${withFirstLowerCase}OrThrow").apply { | ||||||
|  |                 receiver(sourceClassName) | ||||||
|  |                 addCode( | ||||||
|  |                     "return this as %L", | ||||||
|  |                     targetClassTypeDefinition | ||||||
|  |                 ) | ||||||
|  |                 returns(targetClassTypeDefinition) | ||||||
|  |                 addModifiers(KModifier.INLINE) | ||||||
|  |             }.build() | ||||||
|  |         ) | ||||||
|  |         addFunction( | ||||||
|  |             FunSpec.builder("if$simpleName").apply { | ||||||
|  |                 val genericType = TypeVariableName("T", null) | ||||||
|  |                 addTypeVariable(genericType) | ||||||
|  |                 receiver(sourceClassName) | ||||||
|  |                 addParameter( | ||||||
|  |                     "block", | ||||||
|  |                     LambdaTypeName.get( | ||||||
|  |                         null, | ||||||
|  |                         targetClassTypeDefinition, | ||||||
|  |                         returnType = genericType | ||||||
|  |                     ) | ||||||
|  |                 ) | ||||||
|  |                 addCode( | ||||||
|  |                     "return ${castedOrNullName}() ?.let(block)", | ||||||
|  |                     targetClassTypeDefinition | ||||||
|  |                 ) | ||||||
|  |                 returns(genericType.copy(nullable = true)) | ||||||
|  |                 addModifiers(KModifier.INLINE) | ||||||
|  |             }.build() | ||||||
|  |         ) | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										119
									
								
								ksp/classcasts/generator/src/main/kotlin/Processor.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										119
									
								
								ksp/classcasts/generator/src/main/kotlin/Processor.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,119 @@ | |||||||
|  | package dev.inmo.micro_utils.ksp.classcasts.generator | ||||||
|  |  | ||||||
|  | import com.google.devtools.ksp.KspExperimental | ||||||
|  | import com.google.devtools.ksp.getAllSuperTypes | ||||||
|  | import com.google.devtools.ksp.getAnnotationsByType | ||||||
|  | import com.google.devtools.ksp.isAnnotationPresent | ||||||
|  | import com.google.devtools.ksp.processing.CodeGenerator | ||||||
|  | import com.google.devtools.ksp.processing.Resolver | ||||||
|  | import com.google.devtools.ksp.processing.SymbolProcessor | ||||||
|  | import com.google.devtools.ksp.symbol.* | ||||||
|  | import com.squareup.kotlinpoet.* | ||||||
|  | import com.squareup.kotlinpoet.ksp.toClassName | ||||||
|  | import dev.inmo.micro_ksp.generator.writeFile | ||||||
|  | import dev.inmo.micro_utils.ksp.classcasts.ClassCastsExcluded | ||||||
|  | import dev.inmo.micro_utils.ksp.classcasts.ClassCastsIncluded | ||||||
|  | import java.io.File | ||||||
|  |  | ||||||
|  | class Processor( | ||||||
|  |     private val codeGenerator: CodeGenerator | ||||||
|  | ) : SymbolProcessor { | ||||||
|  |     @OptIn(KspExperimental::class) | ||||||
|  |     private fun FileSpec.Builder.generateClassCasts( | ||||||
|  |         ksClassDeclaration: KSClassDeclaration, | ||||||
|  |         resolver: Resolver | ||||||
|  |     ) { | ||||||
|  |         val rootAnnotation = ksClassDeclaration.getAnnotationsByType(ClassCastsIncluded::class).first() | ||||||
|  |         val (includeRegex: Regex?, excludeRegex: Regex?) = rootAnnotation.let { | ||||||
|  |             it.typesRegex.takeIf { it.isNotEmpty() } ?.let(::Regex) to it.excludeRegex.takeIf { it.isNotEmpty() } ?.let(::Regex) | ||||||
|  |         } | ||||||
|  |         val classesSubtypes = mutableMapOf<KSClassDeclaration, MutableSet<KSClassDeclaration>>() | ||||||
|  |  | ||||||
|  |         fun KSClassDeclaration.checkSupertypeLevel(levelsAllowed: Int?): Boolean { | ||||||
|  |             val supertypes by lazy { | ||||||
|  |                 superTypes.map { it.resolve().declaration } | ||||||
|  |             } | ||||||
|  |             return when { | ||||||
|  |                 levelsAllowed == null -> true | ||||||
|  |                 levelsAllowed <= 0 -> false | ||||||
|  |                 supertypes.any { it == ksClassDeclaration } -> true | ||||||
|  |                 else -> supertypes.any { | ||||||
|  |                     (it as? KSClassDeclaration) ?.checkSupertypeLevel(levelsAllowed - 1) == true | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         fun handleDeclaration(ksDeclarationContainer: KSDeclarationContainer) { | ||||||
|  |             ksDeclarationContainer.declarations.forEach { potentialSubtype -> | ||||||
|  |                 val simpleName = potentialSubtype.simpleName.getShortName() | ||||||
|  |                 when { | ||||||
|  |                     potentialSubtype === ksClassDeclaration -> {} | ||||||
|  |                     potentialSubtype.isAnnotationPresent(ClassCastsExcluded::class) -> return@forEach | ||||||
|  |                     potentialSubtype !is KSClassDeclaration || !potentialSubtype.checkSupertypeLevel(rootAnnotation.levelsToInclude.takeIf { it >= 0 }) -> return@forEach | ||||||
|  |                     excludeRegex ?.matches(simpleName) == true -> return@forEach | ||||||
|  |                     includeRegex ?.matches(simpleName) == false -> {} | ||||||
|  |                     else -> classesSubtypes.getOrPut(ksClassDeclaration) { mutableSetOf() }.add(potentialSubtype) | ||||||
|  |                 } | ||||||
|  |                 handleDeclaration(potentialSubtype as? KSDeclarationContainer ?: return@forEach) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         resolver.getAllFiles().forEach { | ||||||
|  |             handleDeclaration(it) | ||||||
|  |         } | ||||||
|  |         fun fillWithSealeds(current: KSClassDeclaration) { | ||||||
|  |             current.getSealedSubclasses().forEach { | ||||||
|  |                 val simpleName = it.simpleName.getShortName() | ||||||
|  |                 if ( | ||||||
|  |                     includeRegex ?.matches(simpleName) == false | ||||||
|  |                     || excludeRegex ?.matches(simpleName) == true | ||||||
|  |                     || it.isAnnotationPresent(ClassCastsExcluded::class) | ||||||
|  |                 ) { | ||||||
|  |                     return@forEach | ||||||
|  |                 } | ||||||
|  |                 classesSubtypes.getOrPut(ksClassDeclaration) { mutableSetOf() }.add(it) | ||||||
|  |                 fillWithSealeds(it) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         fillWithSealeds(ksClassDeclaration) | ||||||
|  |  | ||||||
|  |         addAnnotation( | ||||||
|  |             AnnotationSpec.builder(Suppress::class).apply { | ||||||
|  |                 addMember("\"unused\"") | ||||||
|  |                 addMember("\"RemoveRedundantQualifierName\"") | ||||||
|  |                 addMember("\"RedundantVisibilityModifier\"") | ||||||
|  |                 addMember("\"NOTHING_TO_INLINE\"") | ||||||
|  |                 addMember("\"UNCHECKED_CAST\"") | ||||||
|  |                 addMember("\"OPT_IN_USAGE\"") | ||||||
|  |                 useSiteTarget(AnnotationSpec.UseSiteTarget.FILE) | ||||||
|  |             }.build() | ||||||
|  |         ) | ||||||
|  |         fill( | ||||||
|  |             ksClassDeclaration, | ||||||
|  |             classesSubtypes.values.flatten().toSet() | ||||||
|  |         ) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     @OptIn(KspExperimental::class) | ||||||
|  |     override fun process(resolver: Resolver): List<KSAnnotated> { | ||||||
|  |         (resolver.getSymbolsWithAnnotation(ClassCastsIncluded::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach { | ||||||
|  |             val prefix = it.getAnnotationsByType(ClassCastsIncluded::class).first().outputFilePrefix | ||||||
|  |             it.writeFile(prefix = prefix, suffix = "ClassCasts") { | ||||||
|  |                 FileSpec.builder( | ||||||
|  |                     it.packageName.asString(), | ||||||
|  |                     "${it.simpleName.getShortName()}ClassCasts" | ||||||
|  |                 ).apply { | ||||||
|  |                     addFileComment( | ||||||
|  |                         """ | ||||||
|  |                         THIS CODE HAVE BEEN GENERATED AUTOMATICALLY | ||||||
|  |                         TO REGENERATE IT JUST DELETE FILE | ||||||
|  |                         ORIGINAL FILE: ${it.containingFile ?.fileName} | ||||||
|  |                         """.trimIndent() | ||||||
|  |                     ) | ||||||
|  |                     generateClassCasts(it, resolver) | ||||||
|  |                 }.build() | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         return emptyList() | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										11
									
								
								ksp/classcasts/generator/src/main/kotlin/Provider.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								ksp/classcasts/generator/src/main/kotlin/Provider.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,11 @@ | |||||||
|  | package dev.inmo.micro_utils.ksp.classcasts.generator | ||||||
|  |  | ||||||
|  | import com.google.devtools.ksp.processing.SymbolProcessor | ||||||
|  | import com.google.devtools.ksp.processing.SymbolProcessorEnvironment | ||||||
|  | import com.google.devtools.ksp.processing.SymbolProcessorProvider | ||||||
|  |  | ||||||
|  | class Provider : SymbolProcessorProvider { | ||||||
|  |     override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor = Processor( | ||||||
|  |         environment.codeGenerator | ||||||
|  |     ) | ||||||
|  | } | ||||||
| @@ -0,0 +1 @@ | |||||||
|  | dev.inmo.micro_utils.ksp.classcasts.generator.Provider | ||||||
							
								
								
									
										27
									
								
								ksp/classcasts/generator/test/build.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								ksp/classcasts/generator/test/build.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,27 @@ | |||||||
|  | plugins { | ||||||
|  |     id "org.jetbrains.kotlin.multiplatform" | ||||||
|  |     id "org.jetbrains.kotlin.plugin.serialization" | ||||||
|  |     id "com.android.library" | ||||||
|  |     id "com.google.devtools.ksp" | ||||||
|  | } | ||||||
|  |  | ||||||
|  | apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
|  |  | ||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         commonMain { | ||||||
|  |             dependencies { | ||||||
|  |                 api project(":micro_utils.ksp.classcasts") | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  |  | ||||||
|  | dependencies { | ||||||
|  |     add("kspCommonMainMetadata", project(":micro_utils.ksp.classcasts.generator")) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | ksp { | ||||||
|  | } | ||||||
							
								
								
									
										15
									
								
								ksp/classcasts/generator/test/src/commonMain/kotlin/Test.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								ksp/classcasts/generator/test/src/commonMain/kotlin/Test.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,15 @@ | |||||||
|  | package dev.inmo.micro_utils.ksp.classcasts.generator.test | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.ksp.classcasts.ClassCastsExcluded | ||||||
|  | import dev.inmo.micro_utils.ksp.classcasts.ClassCastsIncluded | ||||||
|  |  | ||||||
|  | @ClassCastsIncluded(levelsToInclude = 1) | ||||||
|  | sealed interface Test { | ||||||
|  |     object A : Test | ||||||
|  |     @ClassCastsExcluded | ||||||
|  |     object B : Test // Will not be included in class casts due to annotation ClassCastsExcluded | ||||||
|  |     object C : Test | ||||||
|  |     interface D : Test { | ||||||
|  |         object DD : D // Will not be included in class casts due to levelsToInclude | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,40 @@ | |||||||
|  | // THIS CODE HAVE BEEN GENERATED AUTOMATICALLY | ||||||
|  | // TO REGENERATE IT JUST DELETE FILE | ||||||
|  | // ORIGINAL FILE: Test.kt | ||||||
|  | @file:Suppress( | ||||||
|  |   "unused", | ||||||
|  |   "RemoveRedundantQualifierName", | ||||||
|  |   "RedundantVisibilityModifier", | ||||||
|  |   "NOTHING_TO_INLINE", | ||||||
|  |   "UNCHECKED_CAST", | ||||||
|  |   "OPT_IN_USAGE", | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | package dev.inmo.micro_utils.ksp.classcasts.generator.test | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.ksp.classcasts.generator.test.Test | ||||||
|  | import kotlin.Suppress | ||||||
|  |  | ||||||
|  | public inline fun Test.aOrNull(): Test.A? = this as? | ||||||
|  |     dev.inmo.micro_utils.ksp.classcasts.generator.test.Test.A | ||||||
|  |  | ||||||
|  | public inline fun Test.aOrThrow(): Test.A = this as | ||||||
|  |     dev.inmo.micro_utils.ksp.classcasts.generator.test.Test.A | ||||||
|  |  | ||||||
|  | public inline fun <T> Test.ifA(block: (Test.A) -> T): T? = aOrNull() ?.let(block) | ||||||
|  |  | ||||||
|  | public inline fun Test.cOrNull(): Test.C? = this as? | ||||||
|  |     dev.inmo.micro_utils.ksp.classcasts.generator.test.Test.C | ||||||
|  |  | ||||||
|  | public inline fun Test.cOrThrow(): Test.C = this as | ||||||
|  |     dev.inmo.micro_utils.ksp.classcasts.generator.test.Test.C | ||||||
|  |  | ||||||
|  | public inline fun <T> Test.ifC(block: (Test.C) -> T): T? = cOrNull() ?.let(block) | ||||||
|  |  | ||||||
|  | public inline fun Test.dOrNull(): Test.D? = this as? | ||||||
|  |     dev.inmo.micro_utils.ksp.classcasts.generator.test.Test.D | ||||||
|  |  | ||||||
|  | public inline fun Test.dOrThrow(): Test.D = this as | ||||||
|  |     dev.inmo.micro_utils.ksp.classcasts.generator.test.Test.D | ||||||
|  |  | ||||||
|  | public inline fun <T> Test.ifD(block: (Test.D) -> T): T? = dOrNull() ?.let(block) | ||||||
| @@ -0,0 +1,5 @@ | |||||||
|  | package dev.inmo.micro_utils.ksp.classcasts | ||||||
|  |  | ||||||
|  | @Target(AnnotationTarget.CLASS) | ||||||
|  | @Retention(AnnotationRetention.SOURCE) | ||||||
|  | annotation class ClassCastsExcluded | ||||||
							
								
								
									
										10
									
								
								ksp/classcasts/src/commonMain/kotlin/ClassCastsIncluded.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								ksp/classcasts/src/commonMain/kotlin/ClassCastsIncluded.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,10 @@ | |||||||
|  | package dev.inmo.micro_utils.ksp.classcasts | ||||||
|  |  | ||||||
|  | @Target(AnnotationTarget.CLASS) | ||||||
|  | @Retention(AnnotationRetention.SOURCE) | ||||||
|  | annotation class ClassCastsIncluded( | ||||||
|  |     val typesRegex: String = "", | ||||||
|  |     val excludeRegex: String = "", | ||||||
|  |     val outputFilePrefix: String = "", | ||||||
|  |     val levelsToInclude: Int = -1 | ||||||
|  | ) | ||||||
							
								
								
									
										20
									
								
								ksp/generator/build.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								ksp/generator/build.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,20 @@ | |||||||
|  | plugins { | ||||||
|  |     id "org.jetbrains.kotlin.jvm" | ||||||
|  | } | ||||||
|  |  | ||||||
|  | apply from: "$publish_jvm" | ||||||
|  |  | ||||||
|  | repositories { | ||||||
|  |     mavenCentral() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | dependencies { | ||||||
|  |     api project(":micro_utils.common") | ||||||
|  |     api libs.kotlin.poet | ||||||
|  |     api libs.ksp | ||||||
|  | } | ||||||
|  |  | ||||||
|  | java { | ||||||
|  |     sourceCompatibility = JavaVersion.VERSION_17 | ||||||
|  |     targetCompatibility = JavaVersion.VERSION_17 | ||||||
|  | } | ||||||
							
								
								
									
										49
									
								
								ksp/generator/src/main/kotlin/FilesWorkaround.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										49
									
								
								ksp/generator/src/main/kotlin/FilesWorkaround.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,49 @@ | |||||||
|  | package dev.inmo.micro_ksp.generator | ||||||
|  |  | ||||||
|  | import com.google.devtools.ksp.symbol.KSClassDeclaration | ||||||
|  | import com.google.devtools.ksp.symbol.KSFile | ||||||
|  | import com.squareup.kotlinpoet.FileSpec | ||||||
|  | import java.io.File | ||||||
|  |  | ||||||
|  | fun KSClassDeclaration.writeFile( | ||||||
|  |     prefix: String = "", | ||||||
|  |     suffix: String = "", | ||||||
|  |     relatedPath: String = "", | ||||||
|  |     force: Boolean = false, | ||||||
|  |     fileSpecBuilder: () -> FileSpec | ||||||
|  | ) { | ||||||
|  |     val containingFile = containingFile!! | ||||||
|  |     File( | ||||||
|  |         File( | ||||||
|  |             File(containingFile.filePath).parent, | ||||||
|  |             relatedPath | ||||||
|  |         ), | ||||||
|  |         "$prefix${simpleName.asString()}$suffix.kt" | ||||||
|  |     ).takeIf { force || !it.exists() } ?.apply { | ||||||
|  |         parentFile.mkdirs() | ||||||
|  |         writer().use { writer -> | ||||||
|  |             fileSpecBuilder().writeTo(writer) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun KSFile.writeFile( | ||||||
|  |     prefix: String = "", | ||||||
|  |     suffix: String = "", | ||||||
|  |     relatedPath: String = "", | ||||||
|  |     force: Boolean = false, | ||||||
|  |     fileSpecBuilder: () -> FileSpec | ||||||
|  | ) { | ||||||
|  |     File( | ||||||
|  |         File( | ||||||
|  |             File(filePath).parent, | ||||||
|  |             relatedPath | ||||||
|  |         ), | ||||||
|  |         "$prefix${fileName.dropLastWhile { it != '.' }.removeSuffix(".")}$suffix.kt" | ||||||
|  |     ).takeIf { force || !it.exists() } ?.apply { | ||||||
|  |         parentFile.mkdirs() | ||||||
|  |         writer().use { writer -> | ||||||
|  |             fileSpecBuilder().writeTo(writer) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,13 @@ | |||||||
|  | package dev.inmo.micro_ksp.generator | ||||||
|  |  | ||||||
|  | import com.google.devtools.ksp.symbol.KSClassDeclaration | ||||||
|  |  | ||||||
|  | val KSClassDeclaration.buildSubFileName: String | ||||||
|  |     get() { | ||||||
|  |         val parentDeclarationCaptured = parentDeclaration | ||||||
|  |         val simpleNameString = simpleName.asString() | ||||||
|  |         return when (parentDeclarationCaptured) { | ||||||
|  |             is KSClassDeclaration -> parentDeclarationCaptured.buildSubFileName | ||||||
|  |             else -> "" | ||||||
|  |         } + simpleNameString | ||||||
|  |     } | ||||||
| @@ -0,0 +1,8 @@ | |||||||
|  | package dev.inmo.micro_ksp.generator | ||||||
|  |  | ||||||
|  | import com.google.devtools.ksp.symbol.KSClassDeclaration | ||||||
|  |  | ||||||
|  | val KSClassDeclaration.companion | ||||||
|  |     get() = declarations.firstNotNullOfOrNull { | ||||||
|  |         (it as? KSClassDeclaration)?.takeIf { it.isCompanionObject } | ||||||
|  |     } | ||||||
							
								
								
									
										11
									
								
								ksp/generator/src/main/kotlin/ResolveSubclasses.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								ksp/generator/src/main/kotlin/ResolveSubclasses.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,11 @@ | |||||||
|  | package dev.inmo.micro_ksp.generator | ||||||
|  |  | ||||||
|  | import com.google.devtools.ksp.symbol.KSClassDeclaration | ||||||
|  |  | ||||||
|  | fun KSClassDeclaration.resolveSubclasses(): List<KSClassDeclaration> { | ||||||
|  |     return (getSealedSubclasses().flatMap { | ||||||
|  |         it.resolveSubclasses() | ||||||
|  |     }.ifEmpty { | ||||||
|  |         sequenceOf(this) | ||||||
|  |     }).toList() | ||||||
|  | } | ||||||
							
								
								
									
										30
									
								
								ksp/generator/src/main/kotlin/WalkOnKSFiles.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								ksp/generator/src/main/kotlin/WalkOnKSFiles.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,30 @@ | |||||||
|  | package dev.inmo.micro_ksp.generator | ||||||
|  |  | ||||||
|  | import com.google.devtools.ksp.getAllSuperTypes | ||||||
|  | import com.google.devtools.ksp.symbol.KSAnnotated | ||||||
|  | import com.google.devtools.ksp.symbol.KSClassDeclaration | ||||||
|  | import com.google.devtools.ksp.symbol.KSDeclarationContainer | ||||||
|  | import com.google.devtools.ksp.symbol.KSFile | ||||||
|  |  | ||||||
|  | fun KSClassDeclaration.findSubClasses(subSymbol: KSAnnotated): Sequence<KSClassDeclaration> { | ||||||
|  |     return when (subSymbol) { | ||||||
|  |         is KSClassDeclaration -> if (subSymbol.getAllSuperTypes().map { it.declaration }.contains(this)) { | ||||||
|  |             sequenceOf(subSymbol) | ||||||
|  |         } else { | ||||||
|  |             sequenceOf() | ||||||
|  |         } | ||||||
|  |         else -> sequenceOf() | ||||||
|  |     } + if (subSymbol is KSDeclarationContainer) { | ||||||
|  |         subSymbol.declarations.flatMap { | ||||||
|  |             findSubClasses(it) | ||||||
|  |         } | ||||||
|  |     } else { | ||||||
|  |         sequenceOf() | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun KSClassDeclaration.findSubClasses(files: Sequence<KSAnnotated>): Sequence<KSClassDeclaration> { | ||||||
|  |     return files.flatMap { | ||||||
|  |         findSubClasses(it) | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										7
									
								
								ksp/sealed/build.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								ksp/sealed/build.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,7 @@ | |||||||
|  | plugins { | ||||||
|  |     id "org.jetbrains.kotlin.multiplatform" | ||||||
|  |     id "org.jetbrains.kotlin.plugin.serialization" | ||||||
|  |     id "com.android.library" | ||||||
|  | } | ||||||
|  |  | ||||||
|  | apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
							
								
								
									
										21
									
								
								ksp/sealed/generator/build.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								ksp/sealed/generator/build.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,21 @@ | |||||||
|  | plugins { | ||||||
|  |     id "org.jetbrains.kotlin.jvm" | ||||||
|  | } | ||||||
|  |  | ||||||
|  | apply from: "$publish_jvm" | ||||||
|  |  | ||||||
|  | repositories { | ||||||
|  |     mavenCentral() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | dependencies { | ||||||
|  |     api project(":micro_utils.ksp.generator") | ||||||
|  |     api project(":micro_utils.ksp.sealed") | ||||||
|  |     api libs.kotlin.poet | ||||||
|  |     api libs.ksp | ||||||
|  | } | ||||||
|  |  | ||||||
|  | java { | ||||||
|  |     sourceCompatibility = JavaVersion.VERSION_17 | ||||||
|  |     targetCompatibility = JavaVersion.VERSION_17 | ||||||
|  | } | ||||||
							
								
								
									
										137
									
								
								ksp/sealed/generator/src/main/kotlin/Processor.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										137
									
								
								ksp/sealed/generator/src/main/kotlin/Processor.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,137 @@ | |||||||
|  | package dev.inmo.micro_utils.ksp.sealed.generator | ||||||
|  |  | ||||||
|  | import com.google.devtools.ksp.KspExperimental | ||||||
|  | import com.google.devtools.ksp.getAnnotationsByType | ||||||
|  | import com.google.devtools.ksp.processing.CodeGenerator | ||||||
|  | import com.google.devtools.ksp.processing.Resolver | ||||||
|  | import com.google.devtools.ksp.processing.SymbolProcessor | ||||||
|  | import com.google.devtools.ksp.symbol.* | ||||||
|  | import com.squareup.kotlinpoet.ClassName | ||||||
|  | import com.squareup.kotlinpoet.CodeBlock | ||||||
|  | import com.squareup.kotlinpoet.FileSpec | ||||||
|  | import com.squareup.kotlinpoet.FunSpec | ||||||
|  | import com.squareup.kotlinpoet.KModifier | ||||||
|  | import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy | ||||||
|  | import com.squareup.kotlinpoet.PropertySpec | ||||||
|  | import com.squareup.kotlinpoet.asTypeName | ||||||
|  | import com.squareup.kotlinpoet.ksp.toClassName | ||||||
|  | import dev.inmo.micro_ksp.generator.buildSubFileName | ||||||
|  | import dev.inmo.micro_ksp.generator.companion | ||||||
|  | import dev.inmo.micro_ksp.generator.findSubClasses | ||||||
|  | import dev.inmo.micro_ksp.generator.writeFile | ||||||
|  | import dev.inmo.microutils.kps.sealed.GenerateSealedWorkaround | ||||||
|  | import java.io.File | ||||||
|  |  | ||||||
|  | class Processor( | ||||||
|  |     private val codeGenerator: CodeGenerator | ||||||
|  | ) : SymbolProcessor { | ||||||
|  |     private fun KSClassDeclaration.findSealedConnection(potentialSealedParent: KSClassDeclaration): Boolean { | ||||||
|  |         val targetClassname = potentialSealedParent.qualifiedName ?.asString() | ||||||
|  |         return superTypes.any { | ||||||
|  |             val itAsDeclaration = it.resolve().declaration as? KSClassDeclaration ?: return@any false | ||||||
|  |             targetClassname == (itAsDeclaration.qualifiedName ?.asString()) || (itAsDeclaration.getSealedSubclasses().any() && itAsDeclaration.findSealedConnection(potentialSealedParent)) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     private fun KSClassDeclaration.resolveSubclasses( | ||||||
|  |         searchIn: Sequence<KSAnnotated>, | ||||||
|  |         allowNonSealed: Boolean | ||||||
|  |     ): Sequence<KSClassDeclaration> { | ||||||
|  |         return findSubClasses(searchIn).let { | ||||||
|  |             if (allowNonSealed) { | ||||||
|  |                 it | ||||||
|  |             } else { | ||||||
|  |                 it.filter { | ||||||
|  |                     it.findSealedConnection(this) | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     @OptIn(KspExperimental::class) | ||||||
|  |     private fun FileSpec.Builder.generateSealedWorkaround( | ||||||
|  |         ksClassDeclaration: KSClassDeclaration, | ||||||
|  |         resolver: Resolver | ||||||
|  |     ) { | ||||||
|  |         val annotation = ksClassDeclaration.getAnnotationsByType(GenerateSealedWorkaround::class).first() | ||||||
|  |         val subClasses = ksClassDeclaration.resolveSubclasses( | ||||||
|  |             searchIn = resolver.getAllFiles(), | ||||||
|  |             allowNonSealed = annotation.includeNonSealedSubTypes | ||||||
|  |         ).distinct() | ||||||
|  |         val subClassesNames = subClasses.filter { | ||||||
|  |             when (it.classKind) { | ||||||
|  |                 ClassKind.ENUM_ENTRY, | ||||||
|  |                 ClassKind.OBJECT -> true | ||||||
|  |                 ClassKind.INTERFACE, | ||||||
|  |                 ClassKind.CLASS, | ||||||
|  |                 ClassKind.ENUM_CLASS, | ||||||
|  |                 ClassKind.ANNOTATION_CLASS -> false | ||||||
|  |             } | ||||||
|  |         }.filter { | ||||||
|  |             it.getAnnotationsByType(GenerateSealedWorkaround.Exclude::class).count() == 0 | ||||||
|  |         }.sortedBy { | ||||||
|  |             (it.getAnnotationsByType(GenerateSealedWorkaround.Order::class).firstOrNull()) ?.order ?: 0 | ||||||
|  |         }.map { | ||||||
|  |             it.toClassName() | ||||||
|  |         }.toList() | ||||||
|  |         val className = ksClassDeclaration.toClassName() | ||||||
|  |         val setType = Set::class.asTypeName().parameterizedBy( | ||||||
|  |             ksClassDeclaration.toClassName() | ||||||
|  |         ) | ||||||
|  |         addProperty( | ||||||
|  |             PropertySpec.builder( | ||||||
|  |                 "values", | ||||||
|  |                 setType | ||||||
|  |             ).apply { | ||||||
|  |                 modifiers.add( | ||||||
|  |                     KModifier.PRIVATE | ||||||
|  |                 ) | ||||||
|  |                 initializer( | ||||||
|  |                     CodeBlock.of( | ||||||
|  |                         """setOf(${subClassesNames.joinToString(",\n") {it.simpleNames.joinToString(".")}})""" | ||||||
|  |                     ) | ||||||
|  |                 ) | ||||||
|  |             }.build() | ||||||
|  |         ) | ||||||
|  |         addFunction( | ||||||
|  |             FunSpec.builder("values").apply { | ||||||
|  |                 val companion = ksClassDeclaration.takeIf { it.isCompanionObject } ?.toClassName() | ||||||
|  |                     ?: ksClassDeclaration.companion ?.toClassName() | ||||||
|  |                     ?: ClassName(className.packageName, *className.simpleNames.toTypedArray(), "Companion") | ||||||
|  |                 receiver(companion) | ||||||
|  |                 returns(setType) | ||||||
|  |                 addCode( | ||||||
|  |                     CodeBlock.of( | ||||||
|  |                         """return values""" | ||||||
|  |                     ) | ||||||
|  |                 ) | ||||||
|  |             }.build() | ||||||
|  |         ) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     @OptIn(KspExperimental::class) | ||||||
|  |     override fun process(resolver: Resolver): List<KSAnnotated> { | ||||||
|  |         (resolver.getSymbolsWithAnnotation(GenerateSealedWorkaround::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach { | ||||||
|  |             val prefix = it.getAnnotationsByType(GenerateSealedWorkaround::class).first().prefix.takeIf { | ||||||
|  |                 it.isNotEmpty() | ||||||
|  |             } ?: it.buildSubFileName.replaceFirst(it.simpleName.asString(), "") | ||||||
|  |             it.writeFile(prefix = prefix, suffix = "SealedWorkaround") { | ||||||
|  |                 FileSpec.builder( | ||||||
|  |                     it.packageName.asString(), | ||||||
|  |                     "${it.simpleName.getShortName()}SealedWorkaround" | ||||||
|  |                 ).apply { | ||||||
|  |                     addFileComment( | ||||||
|  |                         """ | ||||||
|  |                         THIS CODE HAVE BEEN GENERATED AUTOMATICALLY | ||||||
|  |                         TO REGENERATE IT JUST DELETE FILE | ||||||
|  |                         ORIGINAL FILE: ${it.containingFile ?.fileName} | ||||||
|  |                         """.trimIndent() | ||||||
|  |                     ) | ||||||
|  |                     generateSealedWorkaround(it, resolver) | ||||||
|  |                 }.build() | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         return emptyList() | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										11
									
								
								ksp/sealed/generator/src/main/kotlin/Provider.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								ksp/sealed/generator/src/main/kotlin/Provider.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,11 @@ | |||||||
|  | package dev.inmo.micro_utils.ksp.sealed.generator | ||||||
|  |  | ||||||
|  | import com.google.devtools.ksp.processing.SymbolProcessor | ||||||
|  | import com.google.devtools.ksp.processing.SymbolProcessorEnvironment | ||||||
|  | import com.google.devtools.ksp.processing.SymbolProcessorProvider | ||||||
|  |  | ||||||
|  | class Provider : SymbolProcessorProvider { | ||||||
|  |     override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor = Processor( | ||||||
|  |         environment.codeGenerator | ||||||
|  |     ) | ||||||
|  | } | ||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user