diff --git a/ComposeViews/build.gradle.kts b/ComposeViews/build.gradle.kts index 09454e4..16507f9 100644 --- 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")) } \ No newline at end of file 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 index 9c195ee..1388db7 100644 --- 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) } \ No newline at end of file diff --git a/ComposeViews/src/commonMain/kotlin/com/lt/compose_views/refresh_layout/RefreshLayoutNestedScrollConnection.kt b/ComposeViews/src/commonMain/kotlin/com/lt/compose_views/refresh_layout/RefreshLayoutNestedScrollConnection.kt index f3723cf..511c6dc 100644 --- a/ComposeViews/src/commonMain/kotlin/com/lt/compose_views/refresh_layout/RefreshLayoutNestedScrollConnection.kt +++ b/ComposeViews/src/commonMain/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 index 2a2846e..e9d16ec 100644 --- 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 index e023415..ff70cd6 100644 --- a/ComposeViews/src/main/AndroidManifest.xml +++ b/ComposeViews/src/main/AndroidManifest.xml @@ -15,8 +15,7 @@ ~ limitations under the License. --> - + diff --git a/README.md b/README.md index a6099d8..f61b434 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,8 @@ View demo.apk - + + diff --git a/README_CN.md b/README_CN.md index d9aafe5..f5a2e6e 100644 --- a/README_CN.md +++ b/README_CN.md @@ -31,7 +31,8 @@
ComposeViews versionjetpack compose versioncompose-multiplatform versionkotlin version
1.6.71.6.112.0.0+
1.7.11.7.02.0.0+
1.6.11.41.6.71.6.112.0.0+
1.6.0.41.6.11.6.01.9.22
1.5.10.51.5.41.5.101.9.20
1.5.1.51.5.01.5.11.9.0
- + + diff --git a/android_app/build.gradle.kts b/android_app/build.gradle.kts index 15b5968..4e48ae4 100644 --- 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 index bb2b80c..d42ed73 100644 --- a/android_app/src/main/AndroidManifest.xml +++ b/android_app/src/main/AndroidManifest.xml @@ -15,8 +15,7 @@ ~ limitations under the License. --> - + + android:theme="@style/Theme.Test_compose.NoActionBar"> diff --git a/common_app/build.gradle.kts b/common_app/build.gradle.kts index 081a576..9a54674 100644 --- 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,21 +62,25 @@ 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" } } } @@ -84,7 +88,7 @@ kotlin { 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 index c538e83..ff70cd6 100644 --- a/common_app/src/androidMain/AndroidManifest.xml +++ b/common_app/src/androidMain/AndroidManifest.xml @@ -15,8 +15,7 @@ ~ limitations under the License. --> - + diff --git a/common_app/src/wasmJsMain/kotlin/TopLevel.wasmJs.kt b/common_app/src/wasmJsMain/kotlin/TopLevel.wasmJs.kt index 2ee596c..b32a116 100644 --- a/common_app/src/wasmJsMain/kotlin/TopLevel.wasmJs.kt +++ b/common_app/src/wasmJsMain/kotlin/TopLevel.wasmJs.kt @@ -1,5 +1,8 @@ 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 /** * 加载网络图片 @@ -7,5 +10,5 @@ import androidx.compose.ui.graphics.painter.Painter @Composable actual fun rememberPainter(data: String?): Painter { //todo 图片加载 - return resourcePainter("back") + return painterResource(Res.drawable.back) } \ No newline at end of file diff --git a/convention-plugins/src/main/kotlin/convention.publication.gradle.kts b/convention-plugins/src/main/kotlin/convention.publication.gradle.kts index bd4572e..e4de670 100644 --- 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 index 2b5c78a..5dff336 100644 --- 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 index 76ba195..0f67803 100644 --- 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() } diff --git a/gradle.properties b/gradle.properties index 6ba11af..515f702 100644 --- a/gradle.properties +++ b/gradle.properties @@ -47,6 +47,6 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental #Versions -kotlin.version=2.0.0 -compose.version=1.6.11 -ksp.version=2.0.0-1.0.21 \ No newline at end of file +kotlin.version=2.0.21 +compose.version=1.7.0 +ksp.version=2.0.21-1.0.26 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c68..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index 53a6b23..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -42,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj index 27099b8..658023f 100644 --- a/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/iosApp/iosApp.xcodeproj/project.pbxproj @@ -100,6 +100,7 @@ 7555FF77242A565900829871 /* Sources */, 7555FF79242A565900829871 /* Resources */, 9964867F0862B4D9FB6ABFC7 /* Frameworks */, + AF87F814D312E9ED7794C7DB /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -154,6 +155,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + AF87F814D312E9ED7794C7DB /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; E8D673591E7196AEA2EA10E2 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/settings.gradle.kts b/settings.gradle.kts index 5149377..357f015 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -27,20 +27,22 @@ include("wasm_app") includeBuild("convention-plugins") pluginManagement { - repositories { - maven("https://mirrors.tencent.com/nexus/repository/maven-public/") - maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") - maven("https://jitpack.io") - google() - gradlePluginPortal() - mavenCentral() + listOf(repositories, dependencyResolutionManagement.repositories).forEach { + it.apply { + maven("https://mirrors.tencent.com/nexus/repository/maven-public/") + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + maven("https://jitpack.io") + google() + gradlePluginPortal() + mavenCentral() + } } plugins { val kotlinVersion = extra["kotlin.version"] as String val composeVersion = extra["compose.version"] as String val kspVersion = extra["ksp.version"] as String - val agpVersion = "7.4.2" + val agpVersion = "8.3.2" kotlin("jvm").version(kotlinVersion) kotlin("multiplatform").version(kotlinVersion) @@ -54,17 +56,6 @@ pluginManagement { id("com.google.devtools.ksp").version(kspVersion) - id("com.vk.vkompose") version "0.5.4-k2" - } -} - -dependencyResolutionManagement { - repositories { - maven("https://mirrors.tencent.com/nexus/repository/maven-public/") - maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") - maven("https://jitpack.io") - google() - gradlePluginPortal() - mavenCentral() + id("com.vk.vkompose") version "0.6.2-k2" } }
ComposeViews versionjetpack compose versioncompose-multiplatform versionkotlin version
1.6.71.6.112.0.0+
1.7.11.7.02.0.0+
1.6.11.41.6.71.6.112.0.0+
1.6.0.41.6.11.6.01.9.22
1.5.10.51.5.41.5.101.9.20
1.5.1.51.5.01.5.11.9.0