Feature/add jvm target #159

nrobi144 · 2021-01-22T10:20:34Z

There are a couple of open-questions, created a draft PR to hopefully answer them

nrobi144 · 2021-01-22T10:28:16Z

Will check-out the detekt issues & pipeline messages a bit later

nrobi144 · 2021-01-22T10:23:46Z

resources/src/jvmMain/kotlin/dev/icerock/moko/resources/desc/ResourceFormattedStringDesc.kt

+
+actual class ResourceFormattedStringDesc actual constructor(
+    private val stringRes: StringResource,
+    private val args: List<Any>


Right now all the android formatted strings we'll be replaced with {n} when we generate the StringResource, this means that we lose the type of the argument.

One possible solution would be to leave them as they are, and replace them prior to formatting (and get the necessary type information, before localizing them). See MokoBundle

...s/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/jvm/JvmImagesGenerator.kt

nrobi144 · 2021-01-22T10:24:56Z

sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/Testing.kt

@@ -33,7 +32,10 @@ object Testing {
            MR.plurals.test_plural.desc(1),
            MR.plurals.test_plural.desc(2),
            MR.plurals.test_plural.desc(3),
-            nestedTest()
+            MR.plurals.test_plural.desc(7),
+//            TODO nested won't work with the current implementation, since the library tries to resolve from a bundle


I'm not sure how could we solve this

plugin should collect all nested resources too. just like in apple generator implemented

I'm not sure I know what you mean, currently resolving the nested will cause a

Can't find resource for bundle java.util.PropertyResourceBundle, key nested.test

I think on android this works by default, because how android aggregates or searches through the sources, but I may be wrong.
I didn't research much on this, but maybe there is a similar solution for this on the jvm side too.
Did you meant copying over the generated resources from the nested modules, I'd consider that a bit overkill, but I'm not sure

in uber-jar all resources aggregates into single jar, so if we have same name of some resources (like MokoBundle for localizations) we got only one version of this files. to fix it i will move generation of files into package-dependend path

sample/desktop-app/src/jvmMain/kotlin/com/icerockdev/desktop/Main.kt

buildSrc/build.gradle.kts

Alex009 · 2021-01-23T10:16:35Z

also please fix detekt problems, CI failed because of them

...s/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/jvm/JvmColorsGenerator.kt

...ns/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/jvm/JvmFilesGenerator.kt

...s/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/jvm/JvmImagesGenerator.kt

...ns/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/jvm/JvmFontsGenerator.kt

resources/src/jvmMain/kotlin/dev/icerock/moko/resources/desc/ResourceStringDesc.kt

resources/src/jvmMain/kotlin/dev/icerock/moko/resources/desc/StringDesc.kt

sample/desktop-app/src/jvmMain/kotlin/com/icerockdev/desktop/Main.kt

Alex009 · 2021-01-23T10:36:12Z

sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/Testing.kt

@@ -33,7 +32,10 @@ object Testing {
            MR.plurals.test_plural.desc(1),
            MR.plurals.test_plural.desc(2),
            MR.plurals.test_plural.desc(3),
-            nestedTest()
+            MR.plurals.test_plural.desc(7),
+//            TODO nested won't work with the current implementation, since the library tries to resolve from a bundle


plugin should collect all nested resources too. just like in apple generator implemented

settings.gradle.kts

Alex009 · 2021-01-23T10:39:41Z

also i got error when try to compile sample jvm:

17:38:36: Executing task 'run'...

Executing tasks: [run] in project /Users/alekseymikhailovwork/Documents/development/icerockdev_workspace/moko/moko-resources/sample/desktop-app

> Task :plugins:buildSrc:compileKotlin UP-TO-DATE
> Task :plugins:buildSrc:compileJava NO-SOURCE
> Task :plugins:buildSrc:compileGroovy NO-SOURCE
> Task :plugins:buildSrc:processResources NO-SOURCE
> Task :plugins:buildSrc:classes UP-TO-DATE
> Task :plugins:buildSrc:inspectClassesForKotlinIC UP-TO-DATE
> Task :plugins:buildSrc:jar UP-TO-DATE
> Task :plugins:buildSrc:assemble UP-TO-DATE
> Task :plugins:buildSrc:compileTestKotlin NO-SOURCE
> Task :plugins:buildSrc:compileTestJava NO-SOURCE
> Task :plugins:buildSrc:compileTestGroovy NO-SOURCE
> Task :plugins:buildSrc:processTestResources NO-SOURCE
> Task :plugins:buildSrc:testClasses UP-TO-DATE
> Task :plugins:buildSrc:test NO-SOURCE
> Task :plugins:buildSrc:check UP-TO-DATE
> Task :plugins:buildSrc:build UP-TO-DATE
> Task :buildSrc:compileKotlin UP-TO-DATE
> Task :buildSrc:compileJava NO-SOURCE
> Task :buildSrc:compileGroovy NO-SOURCE
> Task :buildSrc:processResources NO-SOURCE
> Task :buildSrc:classes UP-TO-DATE
> Task :buildSrc:inspectClassesForKotlinIC UP-TO-DATE
> Task :buildSrc:jar UP-TO-DATE
> Task :buildSrc:assemble UP-TO-DATE
> Task :buildSrc:compileTestKotlin NO-SOURCE
> Task :buildSrc:compileTestJava NO-SOURCE
> Task :buildSrc:compileTestGroovy NO-SOURCE
> Task :buildSrc:processTestResources NO-SOURCE
> Task :buildSrc:testClasses UP-TO-DATE
> Task :buildSrc:test NO-SOURCE
> Task :buildSrc:check UP-TO-DATE
> Task :buildSrc:build UP-TO-DATE
> Task :plugins:resources-generator:compileKotlin UP-TO-DATE
> Task :plugins:resources-generator:compileJava NO-SOURCE
> Task :plugins:resources-generator:pluginDescriptors UP-TO-DATE
> Task :plugins:resources-generator:processResources UP-TO-DATE
> Task :plugins:resources-generator:classes UP-TO-DATE
> Task :plugins:resources-generator:inspectClassesForKotlinIC UP-TO-DATE
> Task :plugins:resources-generator:jar UP-TO-DATE

> Configure project :resources
used new ios() shortcut target

> Configure project :sample:mpp-library
used new ios() shortcut target

> Configure project :sample:mpp-library:nested-module
used new ios() shortcut target

> Task :sample:desktop-app:jvmProcessResources NO-SOURCE
> Task :sample:mpp-library:nested-module:jvmProcessResources
> Task :sample:mpp-library:jvmProcessResources
> Task :resources:compileKotlinJvm
> Task :resources:jvmProcessResources NO-SOURCE
> Task :resources:jvmMainClasses
> Task :resources:jvmJar

> Task :sample:mpp-library:nested-module:compileKotlinJvm FAILED

Deprecated Gradle features were used in this build, making it incompatible with Gradle 7.0.
Use '--warning-mode all' to show the individual deprecation warnings.
See https://docs.gradle.org/6.8/userguide/command_line_interface.html#sec:command_line_warnings
5 actionable tasks: 5 executed
e: /Users/alekseymikhailovwork/Documents/development/icerockdev_workspace/moko/moko-resources/sample/mpp-library/nested-module/build/generated/moko/commonMain/src/com/icerockdev/library/nested/MR.kt: (11, 15): Expected object 'MR' has no actual declaration in module <nested-module> for JVM

FAILURE: Build failed with an exception.

* What went wrong:
Execution failed for task ':sample:mpp-library:nested-module:compileKotlinJvm'.
> Compilation error. See log for more details

* Try:
Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output. Run with --scan to get full insights.

* Get more help at https://help.gradle.org

BUILD FAILED in 12s
17:38:49: Task execution finished 'run'.

plugins/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/jvm/JvmMRGenerator.kt

…urce sets

# Conflicts: # buildSrc/src/main/kotlin/Deps.kt

Alex009 · 2021-03-09T03:49:50Z

i add some changes in own branch https://github.com/icerockdev/moko-resources/tree/%23151-jvm-target-support
now branch contain not completed support of multimodule and some fixes for building of all samples

Alex009 · 2021-03-09T03:53:00Z

here current changes between branches 3e8012a...#151-jvm-target-support

nrobi144 · 2021-03-11T07:46:09Z

@Alex009 probably we should migrate to PluralRules instead of ChoiceFormat, see https://stackoverflow.com/a/14327683/4487858 for more info

nrobi144 · 2021-03-29T11:05:10Z

@Alex009 in 97489b6 I've migrated to PluralRules implementation.
Regarding

<string name="positional">second string %2$s first decimal %1$d</string>

The current jvm implementation requires that args should be passed in correct order, since we replace every argument with {0}, {1}, ... {n} only.
If we want to cover this aspect also, we have two options:

Create a proper mapper where %1$d -> {0, number, integer}
Using a different formatter then MessageFormat may fix the issue

I think 2) would be a far better option

hmqgg · 2021-08-24T08:02:52Z

Any ETA to publish a release with this PR?

nrobi144 added 4 commits January 18, 2021 14:05

Add jvm target

c7a819d

Add the actual jvm implementations

09e12a1

Implement jvm generators

0e4bc4f

Create desktop-app

a6be3b3

nrobi144 commented Jan 22, 2021

View reviewed changes

Alex009 linked an issue Jan 23, 2021 that may be closed by this pull request

Add JVM target #151

Closed

Alex009 reviewed Jan 23, 2021

View reviewed changes

buildSrc/build.gradle.kts Outdated Show resolved Hide resolved

Alex009 requested changes Jan 23, 2021

View reviewed changes

plugins/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/jvm/JvmMRGenerator.kt Outdated Show resolved Hide resolved

Alex009 added this to the 0.15.0 milestone Jan 23, 2021

Add copyrights & rename "desktop-app" to "jvm-app"

8209e85

nrobi144 force-pushed the feature/add-jvm-target branch from aa2330c to 8209e85 Compare January 24, 2021 14:01

nrobi144 added 2 commits January 24, 2021 17:30

Pass down fileName instead of key when generating an ImageResource

4a087fb

General code quality improvements

3e8012a

Alex009 modified the milestones: 0.15.0, 0.16.0 Feb 2, 2021

igordmn mentioned this pull request Mar 5, 2021

String resources for internationalization (i18n) JetBrains/compose-multiplatform#425

Closed

Alex009 added 9 commits March 6, 2021 22:40

icerockdev#151 fix tests filter in jvm target

5d4dc58

icerockdev#151 fix generation task association for jvm

2a543a9

icerockdev#151 enable generator only for commonSourceSet dependend so…

5742020

…urce sets

icerockdev#151 update kotlin to 1.4.31

03ced28

Merge branch 'develop' into feature/add-jvm-target

423fd64

# Conflicts: # buildSrc/src/main/kotlin/Deps.kt

icerockdev#151 fix update kotlin

92e3177

icerockdev#151 fix jvm compilation

f8485c6

icerockdev#151 enable gradle java toolchain 11

89f7c00

icerockdev#151 pass ClassLoader into JVM resource holders

18d772e

Alex009 self-assigned this Mar 9, 2021

Alex009 changed the base branch from master to develop March 11, 2021 12:39

Alex009 mentioned this pull request Mar 25, 2021

Using common fonts in Jetpack Compose #180

Closed

Update from ChoiceFormat to PluralRules

97489b6

Alex009 linked an issue Apr 8, 2021 that may be closed by this pull request

Using common fonts in Jetpack Compose #180

Closed

Alex009 modified the milestones: 0.16.0, 0.17.0 Jun 25, 2021

anton6tak merged commit 9c7c6ab into icerockdev:develop Aug 24, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/add jvm target #159

Feature/add jvm target #159

nrobi144 commented Jan 22, 2021

nrobi144 commented Jan 22, 2021

nrobi144 Jan 22, 2021

nrobi144 Jan 22, 2021

Alex009 Jan 23, 2021

nrobi144 Jan 24, 2021

Alex009 Mar 9, 2021

Alex009 commented Jan 23, 2021

Alex009 Jan 23, 2021

Alex009 commented Jan 23, 2021

Alex009 commented Mar 9, 2021

Alex009 commented Mar 9, 2021

nrobi144 commented Mar 11, 2021

nrobi144 commented Mar 29, 2021

hmqgg commented Aug 24, 2021

Feature/add jvm target #159

Feature/add jvm target #159

Conversation

nrobi144 commented Jan 22, 2021

nrobi144 commented Jan 22, 2021

nrobi144 Jan 22, 2021

Choose a reason for hiding this comment

nrobi144 Jan 22, 2021

Choose a reason for hiding this comment

Alex009 Jan 23, 2021

Choose a reason for hiding this comment

nrobi144 Jan 24, 2021

Choose a reason for hiding this comment

Alex009 Mar 9, 2021

Choose a reason for hiding this comment

Alex009 commented Jan 23, 2021

Alex009 Jan 23, 2021

Choose a reason for hiding this comment

Alex009 commented Jan 23, 2021

Alex009 commented Mar 9, 2021

Alex009 commented Mar 9, 2021

nrobi144 commented Mar 11, 2021

nrobi144 commented Mar 29, 2021

hmqgg commented Aug 24, 2021