Merge pull request #106 from ltttttttttttt/dev

Dev
ltttttttttttt · Nov 9, 2024 · 7d981a9 · 7d981a9
2 parents a28664c + 1b39652
commit 7d981a9
Show file tree

Hide file tree

Showing 22 changed files with 184 additions and 99 deletions.
diff --git a/ComposeViews/build.gradle.kts b/ComposeViews/build.gradle.kts
@@ -49,7 +49,7 @@ if (vkomposeIsCheck)
 group = "io.github.ltttttttttttt"
 //上传到mavenCentral命令: ./gradlew publishAllPublicationsToSonatypeRepository
 //mavenCentral后台: https://s01.oss.sonatype.org/#stagingRepositories
-version = "$composeVersion.4"
+version = "$composeVersion.1"
 
 kotlin {
     androidTarget {
@@ -59,7 +59,7 @@ kotlin {
     jvm("desktop") {
         compilations.all {
             kotlinOptions {
-                jvmTarget = "11"
+                jvmTarget = "17"
             }
         }
     }
@@ -191,21 +191,93 @@ kotlin {
 }
 
 android {
-    compileSdk = 33
+    namespace = "com.lt.compose_views"
+    compileSdk = 35
     defaultConfig {
         minSdk = 21
-        targetSdk = 31
         sourceSets["main"].manifest.srcFile("src/main/AndroidManifest.xml")
 
         consumerProguardFiles("consumer-rules.pro")
     }
+    lint {
+        targetSdk = 35
+    }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }
 
 //compose配置
 compose {
     //kotlinCompilerPlugin.set("androidx.compose.compiler:compiler:$composeCompilerVersion")
+}
+
+afterEvaluate {
+    tasks.findByName("signAndroidReleasePublication")!!
+        .mustRunAfter(tasks.findByName("publishAndroidDebugPublicationToSonatypeRepository"))
+    tasks.findByName("signIosArm64Publication")!!
+        .mustRunAfter(tasks.findByName("publishAndroidDebugPublicationToSonatypeRepository"))
+    tasks.findByName("signIosSimulatorArm64Publication")!!
+        .mustRunAfter(tasks.findByName("publishAndroidDebugPublicationToSonatypeRepository"))
+    tasks.findByName("signIosX64Publication")!!
+        .mustRunAfter(tasks.findByName("publishAndroidDebugPublicationToSonatypeRepository"))
+    tasks.findByName("signJsPublication")!!
+        .mustRunAfter(tasks.findByName("publishAndroidDebugPublicationToSonatypeRepository"))
+    tasks.findByName("signKotlinMultiplatformPublication")!!
+        .mustRunAfter(tasks.findByName("publishAndroidDebugPublicationToSonatypeRepository"))
+    tasks.findByName("signIosArm64Publication")!!
+        .mustRunAfter(tasks.findByName("publishAndroidReleasePublicationToSonatypeRepository"))
+    tasks.findByName("signIosSimulatorArm64Publication")!!
+        .mustRunAfter(tasks.findByName("publishIosArm64PublicationToSonatypeRepository"))
+    tasks.findByName("signIosSimulatorArm64Publication")!!
+        .mustRunAfter(tasks.findByName("publishAndroidReleasePublicationToSonatypeRepository"))
+    tasks.findByName("signIosX64Publication")!!
+        .mustRunAfter(tasks.findByName("publishIosArm64PublicationToSonatypeRepository"))
+    tasks.findByName("signIosX64Publication")!!
+        .mustRunAfter(tasks.findByName("publishAndroidReleasePublicationToSonatypeRepository"))
+    tasks.findByName("signJsPublication")!!
+        .mustRunAfter(tasks.findByName("publishIosArm64PublicationToSonatypeRepository"))
+    tasks.findByName("signJsPublication")!!
+        .mustRunAfter(tasks.findByName("publishAndroidReleasePublicationToSonatypeRepository"))
+    tasks.findByName("signKotlinMultiplatformPublication")!!
+        .mustRunAfter(tasks.findByName("publishIosArm64PublicationToSonatypeRepository"))
+    tasks.findByName("signKotlinMultiplatformPublication")!!
+        .mustRunAfter(tasks.findByName("publishAndroidReleasePublicationToSonatypeRepository"))
+    tasks.findByName("signIosX64Publication")!!
+        .mustRunAfter(tasks.findByName("publishIosSimulatorArm64PublicationToSonatypeRepository"))
+    tasks.findByName("signJsPublication")!!
+        .mustRunAfter(tasks.findByName("publishIosSimulatorArm64PublicationToSonatypeRepository"))
+    tasks.findByName("signKotlinMultiplatformPublication")!!
+        .mustRunAfter(tasks.findByName("publishIosSimulatorArm64PublicationToSonatypeRepository"))
+    tasks.findByName("signJsPublication")!!
+        .mustRunAfter(tasks.findByName("publishIosX64PublicationToSonatypeRepository"))
+    tasks.findByName("signKotlinMultiplatformPublication")!!
+        .mustRunAfter(tasks.findByName("publishIosX64PublicationToSonatypeRepository"))
+    tasks.findByName("signKotlinMultiplatformPublication")!!
+        .mustRunAfter(tasks.findByName("publishJsPublicationToSonatypeRepository"))
+    tasks.findByName("signWasmJsPublication")!!
+        .mustRunAfter(tasks.findByName("publishKotlinMultiplatformPublicationToSonatypeRepository"))
+    tasks.findByName("signWasmJsPublication")!!
+        .mustRunAfter(tasks.findByName("publishJsPublicationToSonatypeRepository"))
+    tasks.findByName("signWasmJsPublication")!!
+        .mustRunAfter(tasks.findByName("publishIosX64PublicationToSonatypeRepository"))
+    tasks.findByName("signWasmJsPublication")!!
+        .mustRunAfter(tasks.findByName("publishIosSimulatorArm64PublicationToSonatypeRepository"))
+    tasks.findByName("signAndroidDebugPublication")!!
+        .mustRunAfter(tasks.findByName("publishDesktopPublicationToSonatypeRepository"))
+    tasks.findByName("signAndroidReleasePublication")!!
+        .mustRunAfter(tasks.findByName("publishDesktopPublicationToSonatypeRepository"))
+    tasks.findByName("signIosArm64Publication")!!
+        .mustRunAfter(tasks.findByName("publishDesktopPublicationToSonatypeRepository"))
+    tasks.findByName("signIosSimulatorArm64Publication")!!
+        .mustRunAfter(tasks.findByName("publishDesktopPublicationToSonatypeRepository"))
+    tasks.findByName("signIosX64Publication")!!
+        .mustRunAfter(tasks.findByName("publishDesktopPublicationToSonatypeRepository"))
+    tasks.findByName("signJsPublication")!!
+        .mustRunAfter(tasks.findByName("publishDesktopPublicationToSonatypeRepository"))
+    tasks.findByName("signKotlinMultiplatformPublication")!!
+        .mustRunAfter(tasks.findByName("publishDesktopPublicationToSonatypeRepository"))
+    tasks.findByName("signWasmJsPublication")!!
+        .mustRunAfter(tasks.findByName("publishDesktopPublicationToSonatypeRepository"))
 }
diff --git a/ComposeViews/src/commonMain/kotlin/com/lt/compose_views/other/ButtonWithNotRipple.kt b/ComposeViews/src/commonMain/kotlin/com/lt/compose_views/other/ButtonWithNotRipple.kt
@@ -21,14 +21,10 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.material.*
-import androidx.compose.material.ripple.LocalRippleTheme
-import androidx.compose.material.ripple.RippleAlpha
-import androidx.compose.material.ripple.RippleTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 
 /**
@@ -37,6 +33,7 @@ import androidx.compose.ui.graphics.Shape
  *          Button without click effect
  * warning:
  */
+@OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun ButtonWithNotRipple(
     onClick: () -> Unit,
@@ -50,7 +47,7 @@ fun ButtonWithNotRipple(
     contentPadding: PaddingValues = ButtonDefaults.ContentPadding,
     content: @Composable RowScope.() -> Unit
 ) {
-    CompositionLocalProvider(LocalRippleTheme provides NotRippleTheme) {
+    CompositionLocalProvider(LocalUseFallbackRippleImplementation provides true) {
         Button(
             onClick,
             modifier,
@@ -64,13 +61,4 @@ fun ButtonWithNotRipple(
             content
         )
     }
-}
-
-//没有点击效果的样式
-private object NotRippleTheme : RippleTheme {
-    @Composable
-    override fun defaultColor(): Color = Color.Transparent
-
-    @Composable
-    override fun rippleAlpha(): RippleAlpha = RippleAlpha(0f, 0f, 0f, 0f)
 }
diff --git a/...monMain/kotlin/com/lt/compose_views/refresh_layout/RefreshLayoutNestedScrollConnection.kt b/...monMain/kotlin/com/lt/compose_views/refresh_layout/RefreshLayoutNestedScrollConnection.kt
@@ -43,7 +43,7 @@ internal class RefreshLayoutNestedScrollConnection(
         available: Offset,
         source: NestedScrollSource
     ): Offset {
-        if (source == NestedScrollSource.Drag) {
+        if (source == NestedScrollSource.UserInput) {
             when (composePosition) {
                 ComposePosition.Start -> {
                     val value = available.x
@@ -93,7 +93,7 @@ internal class RefreshLayoutNestedScrollConnection(
                 Offset(0f, available.y)
         }
         val refreshOffset = refreshLayoutState.refreshContentOffsetState.value
-        if (source == NestedScrollSource.Drag) {
+        if (source == NestedScrollSource.UserInput) {
             when (composePosition) {
                 ComposePosition.Start -> {
                     if (available.x < 0 && refreshOffset > 0) {

diff --git a/ComposeViews/src/commonMain/kotlin/com/lt/compose_views/res/Strings.kt b/ComposeViews/src/commonMain/kotlin/com/lt/compose_views/res/Strings.kt
@@ -30,9 +30,6 @@ import kotlin.jvm.JvmName
  * effect : 资源
  * warning:
  */
-@Deprecated("Use Strings.kt")
-typealias Res = Strings
-
 object Strings {
 
     /**

diff --git a/ComposeViews/src/main/AndroidManifest.xml b/ComposeViews/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.lt.compose_views">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

diff --git a/README.md b/README.md
@@ -31,7 +31,8 @@ View demo.apk</a>
 
 <table broder="1">
 <tr><td>ComposeViews version</td><td>jetpack compose version</td><td>compose-multiplatform version</td><td>kotlin version</td></tr>
-<tr><td><img src="https://img.shields.io/maven-central/v/io.github.ltttttttttttt/ComposeViews"/></td><td>1.6.7</td><td>1.6.11</td><td>2.0.0+</td></tr>
+<tr><td><img src="https://img.shields.io/maven-central/v/io.github.ltttttttttttt/ComposeViews"/></td><td>1.7.1</td><td>1.7.0</td><td>2.0.0+</td></tr>
+<tr><td>1.6.11.4</td><td>1.6.7</td><td>1.6.11</td><td>2.0.0+</td></tr>
 <tr><td>1.6.0.4</td><td>1.6.1</td><td>1.6.0</td><td>1.9.22</td></tr>
 <tr><td>1.5.10.5</td><td>1.5.4</td><td>1.5.10</td><td>1.9.20</td></tr>
 <tr><td>1.5.1.5</td><td>1.5.0</td><td>1.5.1</td><td>1.9.0</td></tr>

diff --git a/README_CN.md b/README_CN.md
@@ -31,7 +31,8 @@
 
 <table broder="1">
 <tr><td>ComposeViews version</td><td>jetpack compose version</td><td>compose-multiplatform version</td><td>kotlin version</td></tr>
-<tr><td><img src="https://img.shields.io/maven-central/v/io.github.ltttttttttttt/ComposeViews"/></td><td>1.6.7</td><td>1.6.11</td><td>2.0.0+</td></tr>
+<tr><td><img src="https://img.shields.io/maven-central/v/io.github.ltttttttttttt/ComposeViews"/></td><td>1.7.1</td><td>1.7.0</td><td>2.0.0+</td></tr>
+<tr><td>1.6.11.4</td><td>1.6.7</td><td>1.6.11</td><td>2.0.0+</td></tr>
 <tr><td>1.6.0.4</td><td>1.6.1</td><td>1.6.0</td><td>1.9.22</td></tr>
 <tr><td>1.5.10.5</td><td>1.5.4</td><td>1.5.10</td><td>1.9.20</td></tr>
 <tr><td>1.5.1.5</td><td>1.5.0</td><td>1.5.1</td><td>1.9.0</td></tr>

diff --git a/android_app/build.gradle.kts b/android_app/build.gradle.kts
@@ -22,13 +22,14 @@ plugins {
 }
 
 android {
-    compileSdk = 34
-    buildToolsVersion = "30.0.3"
+    namespace = "com.lt.test_compose"
+    compileSdk = 35
+    buildToolsVersion = "35.0.0"
 
     defaultConfig {
         applicationId = "com.lt.test_compose"
         minSdk = 21
-        targetSdk = 31
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
 
@@ -57,11 +58,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         freeCompilerArgs = listOf("-Xallow-kotlin-package")
     }
     buildFeatures {

diff --git a/android_app/src/main/AndroidManifest.xml b/android_app/src/main/AndroidManifest.xml
@@ -15,16 +15,15 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.lt.test_compose">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Test_compose">
+        android:theme="@style/Theme.Test_compose.NoActionBar">
         <activity
             android:name="com.lt.common_app.ComposePagerActivity"
             android:exported="false" />

diff --git a/common_app/build.gradle.kts b/common_app/build.gradle.kts
@@ -49,10 +49,10 @@ if (vkomposeIsCheck)
 group = "com.lt.ltttttttttttt"
 
 android {
-    compileSdk = 33
+    namespace = "com.lt.common_app"
+    compileSdk = 35
     defaultConfig {
         minSdk = 21
-        targetSdk = 31
 
         var testIndex = "-1"
         try {
@@ -62,29 +62,33 @@ android {
         buildConfigField("int", "TEST_INDEX", testIndex)
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     lint {
+        targetSdk = 35
         checkDependencies = true//开启 lint 性能优化
         abortOnError = false//忽略Lint检查
         checkReleaseBuilds = false//压制警告,打包的时候有时候会有莫名其妙的警告
     }
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 kotlin {
     androidTarget {
         compilations.all {
             kotlinOptions {
-                jvmTarget = "11"
+                jvmTarget = "17"
             }
         }
     }
 
     jvm("desktop") {
         compilations.all {
             kotlinOptions {
-                jvmTarget = "11"
+                jvmTarget = "17"
             }
         }
     }
@@ -102,7 +106,6 @@ kotlin {
         browser()
     }
 
-    @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
         moduleName = "common_app"
         browser {

diff --git a/common_app/src/androidMain/AndroidManifest.xml b/common_app/src/androidMain/AndroidManifest.xml
@@ -15,8 +15,7 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.lt.common_app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

diff --git a/common_app/src/wasmJsMain/kotlin/TopLevel.wasmJs.kt b/common_app/src/wasmJsMain/kotlin/TopLevel.wasmJs.kt
@@ -1,11 +1,14 @@
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.painter.Painter
+import com.lt.ltttttttttttt.common_app.generated.resources.Res
+import com.lt.ltttttttttttt.common_app.generated.resources.back
+import org.jetbrains.compose.resources.painterResource
 
 /**
  * 加载网络图片
  */
 @Composable
 actual fun rememberPainter(data: String?): Painter {
     //todo 图片加载
-    return resourcePainter("back")
+    return painterResource(Res.drawable.back)
 }
diff --git a/convention-plugins/src/main/kotlin/convention.publication.gradle.kts b/convention-plugins/src/main/kotlin/convention.publication.gradle.kts
@@ -56,8 +56,7 @@ val javadocJar by tasks.registering(Jar::class) {
 
 fun getExtraString(name: String) = try {
     ext[name]?.toString()
-} catch (e: Exception) {
-    e.printStackTrace()
+} catch (ignore: Exception) {
     null
 }
 

diff --git a/desktop_app/build.gradle.kts b/desktop_app/build.gradle.kts
@@ -27,7 +27,7 @@ group = "com.github.ltttttttttttt"
 kotlin {
     jvm("desktop") {
         compilations.all {
-            kotlinOptions.jvmTarget = "11"
+            kotlinOptions.jvmTarget = "17"
         }
 //        withJava() //https://issuetracker.google.com/issues/248593403?hl=ko
     }

diff --git a/desktop_app/src/desktopMain/kotlin/TitleView.kt b/desktop_app/src/desktopMain/kotlin/TitleView.kt
@@ -19,6 +19,8 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.Divider
 import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -63,7 +65,7 @@ fun BaseComposeActivity.TitleView(
             verticalAlignment = Alignment.CenterVertically,
         ) {
             Image(
-                painter = resourcePainter("back"),
+                imageVector = Icons.AutoMirrored.Default.ArrowBack,
                 contentDescription = "",
                 modifier = Modifier
                     .clickable { mFinish() }