From 5e7f9e1abce0c1871438d577154abe87fb550d67 Mon Sep 17 00:00:00 2001 From: nian1 Date: Mon, 28 Oct 2024 04:35:46 +0800 Subject: [PATCH 1/6] feat: update editor config settings --- .editorconfig | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 1409fc4..8c68d24 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,9 +7,11 @@ indent_size = 2 indent_style = space insert_final_newline = true trim_trailing_whitespace = true +max_line_length = 100 [*.java] ij_java_use_single_class_imports = true +max_line_length = 120 [*.{kt,kts}] ij_kotlin_imports_layout = * @@ -20,8 +22,9 @@ ktlint_standard_property-naming = disabled ktlint_standard_backing-property-naming = disabled ktlint_function_naming_ignore_when_annotated_with = Composable, Test -[*.md] +[*.{md,mdx,diff}] trim_trailing_whitespace = false [Makefile] -indent_style = tab +indent_size = 4 +indent_style = tab \ No newline at end of file From 98177fac9b33c7d4ccc11f9225162b30a3d2b5b6 Mon Sep 17 00:00:00 2001 From: nian1 Date: Mon, 28 Oct 2024 04:36:18 +0800 Subject: [PATCH 2/6] Update Gradle wrapper to use Aliyun mirror --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a441313..7be2216 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://mirrors.aliyun.com/macports/distfiles/gradle/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 236447d9e81bd5a8888be981ba185c0176f5509e Mon Sep 17 00:00:00 2001 From: nian1 Date: Mon, 28 Oct 2024 04:36:37 +0800 Subject: [PATCH 3/6] Add Aliyun Maven repositories --- build-logic/convention/build.gradle.kts | 3 +++ build.gradle.kts | 5 +++++ settings.gradle.kts | 3 +++ 3 files changed, 11 insertions(+) diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts index 0337dd8..8cb343c 100644 --- a/build-logic/convention/build.gradle.kts +++ b/build-logic/convention/build.gradle.kts @@ -10,6 +10,9 @@ repositories { mavenCentral() gradlePluginPortal() google() + maven("https://maven.aliyun.com/repository/public") + maven("https://maven.aliyun.com/repository/gradle-plugin") + maven("https://maven.aliyun.com/repository/google") } group = "com.jithub.app.build-logic" diff --git a/build.gradle.kts b/build.gradle.kts index d140b1c..47b204b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,6 +11,9 @@ buildscript { } } gradlePluginPortal() + maven("https://maven.aliyun.com/repository/public") + maven("https://maven.aliyun.com/repository/google") + maven("https://maven.aliyun.com/repository/gradle-plugin") } dependencies { classpath(libs.redwood.gradle.plugin) @@ -38,6 +41,8 @@ allprojects { includeGroupAndSubgroups("com.google") } } + maven("https://maven.aliyun.com/repository/public") + maven("https://maven.aliyun.com/repository/google") maven("https://jitpack.io") } apply(plugin = "com.jithub.gradle.build-support") diff --git a/settings.gradle.kts b/settings.gradle.kts index 0c7402b..d97786e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,6 +14,9 @@ pluginManagement { } } gradlePluginPortal() + maven("https://maven.aliyun.com/repository/public") + maven("https://maven.aliyun.com/repository/google") + maven("https://maven.aliyun.com/repository/gradle-plugin") } } From 746eca39723ae994a4ec79c1ac05811e769c552f Mon Sep 17 00:00:00 2001 From: nian1 Date: Mon, 28 Oct 2024 04:46:48 +0800 Subject: [PATCH 4/6] Update Kotlin plugin version --- .idea/kotlinc.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index d4b7acc..c224ad5 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file From 1252fa41c59dd4aca477d112236990e9b3fcdcc3 Mon Sep 17 00:00:00 2001 From: nian1 Date: Mon, 28 Oct 2024 04:47:30 +0800 Subject: [PATCH 5/6] feat(deps): upgrade dependencies Upgrades the following dependencies: - `moko-resources` from `0.24.2` to `0.24.3` - `jbr-compose` from `1.6.11` to `1.7.0` - `kotlin` from `2.0.20` to `2.0.21` - `redwood` from `0.14.0` to `0.15.0` --- gradle/libs.versions.toml | 6 +++--- gradle/moko.versions.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c84c588..e8d4ada 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -kotlin = "2.0.20" +kotlin = "2.0.21" agp = "8.2.2" -redwood = "0.14.0" +redwood = "0.15.0" androidx-activityCompose = "1.9.1" androidx-appcompat = "1.7.0" @@ -9,7 +9,7 @@ androidx-constraintlayout = "2.1.4" androidx-core-ktx = "1.13.1" androidx-material = "1.12.0" -jbr-compose = "1.6.11" +jbr-compose = "1.7.0" androidx-espresso-core = "3.6.1" androidx-test-junit = "1.2.1" diff --git a/gradle/moko.versions.toml b/gradle/moko.versions.toml index a1306e4..73e4505 100644 --- a/gradle/moko.versions.toml +++ b/gradle/moko.versions.toml @@ -1,6 +1,6 @@ [versions] # https://repo.maven.apache.org/maven2/dev/icerock/moko/resources/ -resources = "0.24.2" +resources = "0.24.3" [plugins] From 376aa08249b9d663be7064270967c06dbbb2bf2f Mon Sep 17 00:00:00 2001 From: nian1 Date: Mon, 28 Oct 2024 04:48:31 +0800 Subject: [PATCH 6/6] Fix build error --- .../src/main/kotlin/com/jithub/app/shared/redwood/schema.kt | 2 -- .../src/commonMain/kotlin/com/jithub/app/shared/Counter.kt | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/redwood/schema/src/main/kotlin/com/jithub/app/shared/redwood/schema.kt b/redwood/schema/src/main/kotlin/com/jithub/app/shared/redwood/schema.kt index a60fd18..676bbae 100644 --- a/redwood/schema/src/main/kotlin/com/jithub/app/shared/redwood/schema.kt +++ b/redwood/schema/src/main/kotlin/com/jithub/app/shared/redwood/schema.kt @@ -3,7 +3,6 @@ package com.jithub.app.shared.redwood import app.cash.redwood.layout.RedwoodLayout -import app.cash.redwood.schema.Default import app.cash.redwood.schema.Property import app.cash.redwood.schema.Schema import app.cash.redwood.schema.Schema.Dependency @@ -27,7 +26,6 @@ data class Text(@Property(1) val text: String?) data class Button( @Property(1) val text: String?, @Property(2) - @Default("true") val enabled: Boolean = true, @Property(3) val onClick: (() -> Unit)? = null, ) diff --git a/shared/src/commonMain/kotlin/com/jithub/app/shared/Counter.kt b/shared/src/commonMain/kotlin/com/jithub/app/shared/Counter.kt index 4ecde14..3d50eb3 100644 --- a/shared/src/commonMain/kotlin/com/jithub/app/shared/Counter.kt +++ b/shared/src/commonMain/kotlin/com/jithub/app/shared/Counter.kt @@ -15,7 +15,11 @@ import com.jithub.app.shared.redwood.compose.Button import com.jithub.app.shared.redwood.compose.Text @Composable -fun Counter(modifier: Modifier = Modifier, value: Int = 0, labels: StringList? = StringList(listOf())) { +fun Counter( + modifier: Modifier = Modifier, + value: Int = 0, + labels: StringList? = StringList(listOf()), +) { var count by rememberSaveable { mutableIntStateOf(value) } Column( width = Constraint.Fill,