File tree Expand file tree Collapse file tree 4 files changed +5
-43
lines changed
Expand file tree Collapse file tree 4 files changed +5
-43
lines changed Original file line number Diff line number Diff line change @@ -4,37 +4,19 @@ plugins {
44 id(" org.jetbrains.compose" )
55}
66
7- val osName = System .getProperty(" os.name" )!!
8- val hostOs = when {
9- osName == " Mac OS X" -> " macos"
10- osName.startsWith(" Win" ) -> " windows"
11- osName.startsWith(" Linux" ) -> " linux"
12- else -> error(" Unsupported OS: $osName " )
13- }
14-
15- var hostArch = when (val osArch = System .getProperty(" os.arch" )) {
16- " x86_64" , " amd64" -> " x64"
17- " aarch64" -> " arm64"
18- else -> error(" Unsupported arch: $osArch " )
19- }
20-
21- val skikoVersion = extra[" skiko.version" ] as String
227val letsPlotVersion = extra[" letsPlot.version" ] as String
238val letsPlotKotlinVersion = extra[" letsPlotKotlin.version" ] as String
249
2510dependencies {
2611 implementation(compose.desktop.currentOs)
2712 compileOnly(compose.ui)
2813
29- // implementation("org.jetbrains.skiko:skiko:$skikoVersion")
30- // implementation("org.jetbrains.skiko:skiko-awt-runtime-$hostOs-$hostArch:$skikoVersion")
31-
3214 implementation(" org.jetbrains.lets-plot:lets-plot-kotlin-kernel:$letsPlotKotlinVersion " )
3315 implementation(" org.jetbrains.lets-plot:lets-plot-common:$letsPlotVersion " )
3416 implementation(" org.jetbrains.lets-plot:platf-awt:$letsPlotVersion " )
3517
3618 implementation(project(" :lets-plot-compose" ))
3719 implementation(project(" :demo-plot-shared" ))
3820
39- implementation(" org.slf4j:slf4j-simple:2.0.9 " ) // Enable logging to console
21+ implementation(" org.slf4j:slf4j-simple:2.0.17 " ) // Enable logging to console
4022}
Original file line number Diff line number Diff line change @@ -4,33 +4,12 @@ plugins {
44 id(" org.jetbrains.compose" )
55}
66
7- val composeVersion = extra[" compose.version" ] as String
8- val skikoVersion = extra[" skiko.version" ] as String
97val letsPlotVersion = extra[" letsPlot.version" ] as String
108
11- val osName = System .getProperty(" os.name" )!!
12- val hostOs = when {
13- osName == " Mac OS X" -> " macos"
14- osName.startsWith(" Win" ) -> " windows"
15- osName.startsWith(" Linux" ) -> " linux"
16- else -> error(" Unsupported OS: $osName " )
17- }
18-
19- var hostArch = when (val osArch = System .getProperty(" os.arch" )) {
20- " x86_64" , " amd64" -> " x64"
21- " aarch64" -> " arm64"
22- else -> error(" Unsupported arch: $osArch " )
23- }
24-
25- val host = " ${hostOs} -${hostArch} "
26-
27-
289dependencies {
2910 implementation(compose.desktop.currentOs)
3011 compileOnly(compose.ui)
3112
32- // implementation("org.jetbrains.skiko:skiko:$skikoVersion")
33- // implementation("org.jetbrains.skiko:skiko-awt-runtime-$hostOs-$hostArch:$skikoVersion")
3413 implementation(" org.jetbrains.lets-plot:lets-plot-common:$letsPlotVersion " )
3514
3615 implementation(project(" :lets-plot-compose" ))
Original file line number Diff line number Diff line change 33### Compatibility
44
55- [ Compose Multiplatform] ( https://github.com/JetBrains/compose-multiplatform ) 1.8.2
6- - [ Skiko] ( https://github.com/JetBrains/skiko ) 0.9.4.2
76- [ Lets-Plot Kotlin API] ( https://github.com/JetBrains/lets-plot-kotlin ) 4.11.1
87- [ Lets-Plot Multiplatform] ( https://github.com/JetBrains/lets-plot ) 4.7.2
98
Original file line number Diff line number Diff line change @@ -137,7 +137,8 @@ tasks.register("pullDebugImages") {
137137 }
138138
139139 // 2. Get sdk.dir from local.properties
140- val sdkDir = localProperties.getProperty(" sdk.dir" ) ? : System .getenv(" ANDROID_HOME" ) ? : System .getProperty(" android.home" )
140+ val sdkDir = localProperties.getProperty(" sdk.dir" ) ? : System .getenv(" ANDROID_HOME" )
141+ ? : System .getProperty(" android.home" )
141142 if (sdkDir == null ) {
142143 throw GradleException (" sdk.dir not found in local.properties and ANDROID_HOME or android.home not set" )
143144 }
@@ -174,7 +175,8 @@ tasks.register("pullDebugImages") {
174175 println (" Pulling images from device: $deviceSerial " )
175176
176177 // The directory on device to pull from
177- val devicePicturesDir = " /storage/emulated/0/Android/data/org.jetbrains.letsPlot.android.canvas.test/files/Pictures/"
178+ val devicePicturesDir =
179+ " /storage/emulated/0/Android/data/org.jetbrains.letsPlot.android.canvas.test/files/Pictures/"
178180 // The local directory to initially pull the images to
179181 val tempLocalDir = File (destDir, " temp_pictures" )
180182 if (tempLocalDir.exists()) {
You can’t perform that action at this time.
0 commit comments