From 48d2c15eb0b9cebe9ffd30ca60ee7f5384ff2e1d Mon Sep 17 00:00:00 2001 From: "oleksandr.karpovich" Date: Mon, 6 Nov 2023 14:15:44 +0100 Subject: [PATCH] Try reproduce --- components/gradle.properties | 8 ++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../demo/androidApp/build.gradle.kts | 32 ++++++++++++++--- .../resources/demo/androidApp/debug.keystore | Bin 0 -> 2104 bytes .../androidApp/src/main/AndroidManifest.xml | 3 +- .../resources/demo/shared/build.gradle.kts | 9 ++--- .../src/androidMain/AndroidManifest.xml | 2 +- .../resources/demo/shared/UseResources.kt | 7 ++++ .../src/commonMain/resources/drawable/img.png | Bin 0 -> 31449 bytes .../commonMain/resources/drawable/vector.xml | 34 ++++++++++++++++++ components/resources/library/build.gradle.kts | 13 +++---- .../src/androidMain/AndroidManifest.xml | 2 +- 12 files changed, 88 insertions(+), 24 deletions(-) create mode 100644 components/resources/demo/androidApp/debug.keystore create mode 100644 components/resources/demo/shared/src/commonMain/resources/drawable/img.png create mode 100644 components/resources/demo/shared/src/commonMain/resources/drawable/vector.xml diff --git a/components/gradle.properties b/components/gradle.properties index c52d6fe71c..74f0eb7180 100644 --- a/components/gradle.properties +++ b/components/gradle.properties @@ -3,17 +3,15 @@ android.useAndroidX=true android.enableJetifier=true kotlin.code.style=official # __KOTLIN_COMPOSE_VERSION__ -kotlin.version=1.8.22 +kotlin.version=1.9.20 # __LATEST_COMPOSE_RELEASE_VERSION__ -compose.version=1.5.10-rc01 -agp.version=7.3.1 +compose.version=1.5.10 +agp.version=8.1.0 org.jetbrains.compose.experimental.jscanvas.enabled=true org.jetbrains.compose.experimental.macos.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true kotlin.native.useEmbeddableCompilerJar=true -kotlin.native.enableDependencyPropagation=false -kotlin.mpp.enableGranularSourceSetsMetadata=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental compose.desktop.verbose=true diff --git a/components/gradle/wrapper/gradle-wrapper.properties b/components/gradle/wrapper/gradle-wrapper.properties index ae04661ee7..15de90249f 100644 --- a/components/gradle/wrapper/gradle-wrapper.properties +++ b/components/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/components/resources/demo/androidApp/build.gradle.kts b/components/resources/demo/androidApp/build.gradle.kts index 3c2f0857ff..b62d4cb9d0 100644 --- a/components/resources/demo/androidApp/build.gradle.kts +++ b/components/resources/demo/androidApp/build.gradle.kts @@ -13,16 +13,40 @@ dependencies { } android { - compileSdk = 33 + compileSdk = 34 defaultConfig { applicationId = "me.user.androidApp" minSdk = 21 - targetSdk = 33 + targetSdk = 34 versionCode = 1 versionName = "1.0" } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + namespace = "org.jetbrains.compose.resources.demo" + + signingConfigs { + // We use a bundled debug keystore, to allow debug builds from CI to be upgradable + named("debug") { + storeFile = project.file("debug.keystore") + storePassword = "android" + keyAlias = "androiddebugkey" + keyPassword = "android" + } + } + + buildTypes { + getByName("debug") { + signingConfig = signingConfigs.getByName("debug") + } + + getByName("release") { + isMinifyEnabled = true + signingConfig = signingConfigs.getByName("debug") + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro") + } } } diff --git a/components/resources/demo/androidApp/debug.keystore b/components/resources/demo/androidApp/debug.keystore new file mode 100644 index 0000000000000000000000000000000000000000..6024334a44d5daef9c2d82556060e6a29a6b9afb GIT binary patch literal 2104 zcmbW%X*kr29tZH5F~eA9EZHJrE`w40(ZrO|BufcnFC=RwyFx>Q$;jFzNh156Jz0`< z>?)!~Ge<>{EwaZH#+h^Od2yfn^1k@K`M&r)zvuURo)7y6`v(XFf^Y)S9f{gXx{o;qkkLzeCjnL5OapwJ${&?Gmgt*!Y#8?^qY;smO4qcEXK~@Xf|Q z#v1)eK3Zl!l7_SC=jOX{W(W`UbiM|v-cqI4PK#fQijh$opsr-^kHrXq(qE&3r z2l074p>P*Q+W1YZ6I|M@h<@x}X{DvobBfn@(5WG1bf&^b<(`z?^lkTT$GDVpv28MC zbnv}N+YAN2lh$&Kz3QqPDi_fimhDA@m#37%>a>DHg46dSs11_Z_|f%>#m-~?B}E#1 z3XS{D`>ZrqjlLluWNhD+2eVhd>8dne)Li&si0#PZ>JJPx#^_u#aXg$=pn}wXX+Wi) zgkz)IP=bpVTPEu}X1A|C5PNZ9^Nww4`AmISUh)TraN?Pn_i{Jf*-?JfFLn*;+tsoG z=-6wmuCF7lmYfYM-_MmSULBs0W;!h5atn?AfG@k%xF3o63Db4-Dv{_${4!VP3Eg$) zababf-dNAN$FqH`;C$c@YULY^4^|S_G(-8rTq={nJ&#u8C!zTnlQSJp_RemojrOAu zvQ@Y?&E?D?D`@+{F)vbp$Spzr4ga^fcW8c2UWX*|x=U*ZV`y<1QromuVqB?(Wb3%W zzuEovT3+wr_l%}HjaO4kuR{Gnlg9J5`fJ%6Wg#|v1;y0o_{oW4bP+`Db8h4ifuiCg zi!2FtZh>Ux9Fo9U1)Is^qVn=St}NpR)n0r(93Or!Ql8+xxyv(hNC%3KN z#e5ZX9&pHo^Qnc&w9yN?Dy<^|KcoiMVN7Hx=4O_9x@6mC>ogEPp5Y#;)g{6&4$UX& zSsXW-$V%uw0Beq_v|y8&3TCSM#;{L1Hqv_fU2}AyScmb+{0O8Mf1c%Kd%xea<_+15 z2LrP*jn~qC_IDULSDvMKqc!ocii8 zvHWQhI>IY5dc9mnD0DyvRi|Y(GbnXFW?D4Y?U$x5ma@?7+m~=uXXeR4;%Y_{-Jr(h zJjS+{VYm0P+rGu|2tim&X{)?%Y(Aj=1s2DBr3K}RZ_>YM(mT;=C2oorAxzgckHt;E z9qTnIQZY>8M-1_V3i{}wRk2RD1z4*8sW>H_J6OHTU$FWkdn?!Aa-2X?)`mQTJ7AZ%-brZ*Kb=$-DvDPNVHvv za#9XaYF#8q>-=LielGui4I97&`k&;NZX{Js7Cvh3DEDZ(@_j7FeJ`G~B?v%9M88{& zwD(q4pIM7ogc|DF;5R-Dy>d?WENbRHv6K|nea~zaFtsuq+o!BNh}wN@lfW; zDQMHSDY0Ypc>V;n;p_xB%Jf(gM5;M@By_;$qqp%RpQWv`!H?n3J82!dr|{_fzk!5Z zRKo%|4w>@+4e|}3frlVqFo59Z#l)VC-9~UsR>(y4GadAmy}n`D@93YrZ1~MOOv3&98RC(1qEc;BmNz9_cx zy0+2j8)RlFskgm-f-$62clD&OB!+SFN2jV=Rr+MMc*iev!24*GL0pfLcv|W*={}#RfT;b^#AV!3^VP3Ru9Uc^o-N3u&`WMege11@B}9>gJ7(v` zzaMzQoyCe{jZX%q1Po;7=t+wgLyLqy3G{W|C;Ch?SY0!A9 - + - \ No newline at end of file + \ No newline at end of file diff --git a/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/UseResources.kt b/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/UseResources.kt index b1fa10c534..86981cc4f2 100644 --- a/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/UseResources.kt +++ b/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/UseResources.kt @@ -33,5 +33,12 @@ internal fun UseResources() { modifier = Modifier.size(150.dp), contentDescription = null ) + + // To try reproduce https://github.com/JetBrains/compose-multiplatform/issues/3893 + Image( + painter = painterResource("drawable/img.png"), + contentDescription = null, + modifier = Modifier.size(150.dp), + ) } } diff --git a/components/resources/demo/shared/src/commonMain/resources/drawable/img.png b/components/resources/demo/shared/src/commonMain/resources/drawable/img.png new file mode 100644 index 0000000000000000000000000000000000000000..f33b6c2622af12b1fe63d5a3f79725058e760381 GIT binary patch literal 31449 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 Km#vmI3;jP`-AaT2 literal 0 HcmV?d00001 diff --git a/components/resources/demo/shared/src/commonMain/resources/drawable/vector.xml b/components/resources/demo/shared/src/commonMain/resources/drawable/vector.xml new file mode 100644 index 0000000000..1f6bb29060 --- /dev/null +++ b/components/resources/demo/shared/src/commonMain/resources/drawable/vector.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/components/resources/library/build.gradle.kts b/components/resources/library/build.gradle.kts index 3bff485c99..6518cf935a 100644 --- a/components/resources/library/build.gradle.kts +++ b/components/resources/library/build.gradle.kts @@ -11,7 +11,7 @@ val composeVersion = extra["compose.version"] as String kotlin { jvm("desktop") - android { + androidTarget { publishLibraryVariants("release") } ios() @@ -63,7 +63,7 @@ kotlin { dependsOn(jvmAndAndroidMain) dependsOn(commonButJSMain) } - val androidTest by getting { + val androidUnitTest by getting { dependencies { } @@ -96,16 +96,16 @@ kotlin { } android { - compileSdk = 33 + compileSdk = 34 sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") defaultConfig { minSdk = 21 - targetSdk = 33 + targetSdk = 34 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } testOptions { managedDevices { @@ -118,6 +118,7 @@ android { } } } + namespace = "org.jetbrains.compose.components.resources" } dependencies { diff --git a/components/resources/library/src/androidMain/AndroidManifest.xml b/components/resources/library/src/androidMain/AndroidManifest.xml index 8cbd70ab54..1d26c87a17 100644 --- a/components/resources/library/src/androidMain/AndroidManifest.xml +++ b/components/resources/library/src/androidMain/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file