Browse Source

Try reproduce

reproduce_resources_3893
oleksandr.karpovich 1 year ago
parent
commit
48d2c15eb0
  1. 8
      components/gradle.properties
  2. 2
      components/gradle/wrapper/gradle-wrapper.properties
  3. 32
      components/resources/demo/androidApp/build.gradle.kts
  4. BIN
      components/resources/demo/androidApp/debug.keystore
  5. 3
      components/resources/demo/androidApp/src/main/AndroidManifest.xml
  6. 9
      components/resources/demo/shared/build.gradle.kts
  7. 2
      components/resources/demo/shared/src/androidMain/AndroidManifest.xml
  8. 7
      components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/UseResources.kt
  9. BIN
      components/resources/demo/shared/src/commonMain/resources/drawable/img.png
  10. 34
      components/resources/demo/shared/src/commonMain/resources/drawable/vector.xml
  11. 13
      components/resources/library/build.gradle.kts
  12. 2
      components/resources/library/src/androidMain/AndroidManifest.xml

8
components/gradle.properties

@ -3,17 +3,15 @@ android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
kotlin.code.style=official kotlin.code.style=official
# __KOTLIN_COMPOSE_VERSION__ # __KOTLIN_COMPOSE_VERSION__
kotlin.version=1.8.22 kotlin.version=1.9.20
# __LATEST_COMPOSE_RELEASE_VERSION__ # __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=1.5.10-rc01 compose.version=1.5.10
agp.version=7.3.1 agp.version=8.1.0
org.jetbrains.compose.experimental.jscanvas.enabled=true org.jetbrains.compose.experimental.jscanvas.enabled=true
org.jetbrains.compose.experimental.macos.enabled=true org.jetbrains.compose.experimental.macos.enabled=true
org.jetbrains.compose.experimental.uikit.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true
kotlin.native.useEmbeddableCompilerJar=true kotlin.native.useEmbeddableCompilerJar=true
kotlin.native.enableDependencyPropagation=false
kotlin.mpp.enableGranularSourceSetsMetadata=true
# Enable kotlin/native experimental memory model # Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental kotlin.native.binary.memoryModel=experimental
compose.desktop.verbose=true compose.desktop.verbose=true

2
components/gradle/wrapper/gradle-wrapper.properties vendored

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

32
components/resources/demo/androidApp/build.gradle.kts

@ -13,16 +13,40 @@ dependencies {
} }
android { android {
compileSdk = 33 compileSdk = 34
defaultConfig { defaultConfig {
applicationId = "me.user.androidApp" applicationId = "me.user.androidApp"
minSdk = 21 minSdk = 21
targetSdk = 33 targetSdk = 34
versionCode = 1 versionCode = 1
versionName = "1.0" versionName = "1.0"
} }
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_1_8 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")
}
} }
} }

BIN
components/resources/demo/androidApp/debug.keystore

Binary file not shown.

3
components/resources/demo/androidApp/src/main/AndroidManifest.xml

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android">
package="org.jetbrains.compose.resources.demo">
<application <application
android:allowBackup="true" android:allowBackup="true"

9
components/resources/demo/shared/build.gradle.kts

@ -89,21 +89,22 @@ kotlin {
} }
android { android {
compileSdk = 33 compileSdk = 34
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
defaultConfig { defaultConfig {
minSdk = 21 minSdk = 21
targetSdk = 33 targetSdk = 34
} }
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_11
} }
sourceSets { sourceSets {
named("main") { named("main") {
resources.srcDir("src/commonMain/resources") resources.srcDir("src/commonMain/resources")
} }
} }
namespace = "org.jetbrains.compose.resources.demo.shared"
} }
compose.experimental { compose.experimental {

2
components/resources/demo/shared/src/androidMain/AndroidManifest.xml

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest package="org.jetbrains.compose.resources.demo.shared"/> <manifest/>

7
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), modifier = Modifier.size(150.dp),
contentDescription = null 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),
)
} }
} }

BIN
components/resources/demo/shared/src/commonMain/resources/drawable/img.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

34
components/resources/demo/shared/src/commonMain/resources/drawable/vector.xml

@ -0,0 +1,34 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillType="evenOdd"
android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
android:strokeWidth="1"
android:strokeColor="#00000000">
<aapt:attr name="android:fillColor">
<gradient
android:endX="78.5885"
android:endY="90.9159"
android:startX="48.7653"
android:startY="61.0927"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>

13
components/resources/library/build.gradle.kts

@ -11,7 +11,7 @@ val composeVersion = extra["compose.version"] as String
kotlin { kotlin {
jvm("desktop") jvm("desktop")
android { androidTarget {
publishLibraryVariants("release") publishLibraryVariants("release")
} }
ios() ios()
@ -63,7 +63,7 @@ kotlin {
dependsOn(jvmAndAndroidMain) dependsOn(jvmAndAndroidMain)
dependsOn(commonButJSMain) dependsOn(commonButJSMain)
} }
val androidTest by getting { val androidUnitTest by getting {
dependencies { dependencies {
} }
@ -96,16 +96,16 @@ kotlin {
} }
android { android {
compileSdk = 33 compileSdk = 34
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
defaultConfig { defaultConfig {
minSdk = 21 minSdk = 21
targetSdk = 33 targetSdk = 34
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_11
} }
testOptions { testOptions {
managedDevices { managedDevices {
@ -118,6 +118,7 @@ android {
} }
} }
} }
namespace = "org.jetbrains.compose.components.resources"
} }
dependencies { dependencies {

2
components/resources/library/src/androidMain/AndroidManifest.xml

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest package="org.jetbrains.compose.components.resources"/> <manifest/>
Loading…
Cancel
Save