Skip to content

Commit 4d22090

Browse files
IKupriyanov-HORISIKupriyanov-HORIS
committed
Update future_changes.md, disable Android support
1 parent 918e420 commit 4d22090

File tree

5 files changed

+110
-110
lines changed

5 files changed

+110
-110
lines changed

‎future_changes.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
### Changed
1414

1515
### Fixed
16-
- The problem occurs when I put two PlotPanels in Row or Column.
16+
- The problem occurs when I put two PlotPanels in Row or Column
1717
[[#32](https://github.com/JetBrains/lets-plot-skia/issues/32)].

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ skiko.version=0.8.18
2929

3030
androidx.activity.compose=1.8.2
3131

32-
letsPlot.version=4.6.3-SNAPSHOT
32+
letsPlot.version=4.6.2
3333
letsPlotKotlin.version=4.10.0
3434

3535
nexusStaging.version=0.30.0

‎lets-plot-compose/build.gradle.kts‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
plugins {
77
kotlin("multiplatform")
88
kotlin("plugin.compose")
9-
id("com.android.library")
9+
//id("com.android.library")
1010
id("org.jetbrains.compose")
1111
`maven-publish`
1212
signing
@@ -25,9 +25,9 @@ kotlin {
2525
}
2626
}
2727

28-
androidTarget {
29-
publishLibraryVariants("release")
30-
}
28+
// androidTarget {
29+
// publishLibraryVariants("release")
30+
// }
3131

3232
sourceSets {
3333
named("commonMain") {
@@ -53,43 +53,43 @@ kotlin {
5353
}
5454
}
5555

56-
named("androidMain") {
57-
dependencies {
58-
api(project(":platf-skia"))
59-
compileOnly("org.jetbrains.lets-plot:plot-raster:${letsPlotVersion}")
60-
compileOnly("org.jetbrains.lets-plot:canvas:${letsPlotVersion}")
61-
}
62-
}
56+
// named("androidMain") {
57+
// dependencies {
58+
// api(project(":platf-skia"))
59+
// compileOnly("org.jetbrains.lets-plot:plot-raster:${letsPlotVersion}")
60+
// compileOnly("org.jetbrains.lets-plot:canvas:${letsPlotVersion}")
61+
// }
62+
// }
6363
}
6464
}
6565

66-
android {
67-
namespace = "org.jetbrains.letsPlot.skia.compose"
68-
69-
compileSdk = (findProperty("android.compileSdk") as String).toInt()
70-
71-
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
72-
73-
defaultConfig {
74-
minSdk = (findProperty("android.minSdk") as String).toInt()
75-
}
76-
77-
buildTypes {
78-
getByName("release") {
79-
isMinifyEnabled = false // true - error: when compiling demo cant resolve classes
80-
// proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
81-
}
82-
}
83-
84-
compileOptions {
85-
sourceCompatibility = JavaVersion.VERSION_11
86-
targetCompatibility = JavaVersion.VERSION_11
87-
}
88-
89-
kotlin {
90-
jvmToolchain(11)
91-
}
92-
}
66+
//android {
67+
// namespace = "org.jetbrains.letsPlot.skia.compose"
68+
//
69+
// compileSdk = (findProperty("android.compileSdk") as String).toInt()
70+
//
71+
// sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
72+
//
73+
// defaultConfig {
74+
// minSdk = (findProperty("android.minSdk") as String).toInt()
75+
// }
76+
//
77+
// buildTypes {
78+
// getByName("release") {
79+
// isMinifyEnabled = false // true - error: when compiling demo cant resolve classes
80+
//// proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
81+
// }
82+
// }
83+
//
84+
// compileOptions {
85+
// sourceCompatibility = JavaVersion.VERSION_11
86+
// targetCompatibility = JavaVersion.VERSION_11
87+
// }
88+
//
89+
// kotlin {
90+
// jvmToolchain(11)
91+
// }
92+
//}
9393

9494

9595
///////////////////////////////////////////////

‎platf-skia/build.gradle.kts‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import java.util.*
99

1010
plugins {
1111
kotlin("multiplatform")
12-
id("com.android.library")
12+
//id("com.android.library")
1313
`maven-publish`
1414
signing
1515
}
@@ -40,9 +40,9 @@ kotlin {
4040
}
4141
}
4242

43-
androidTarget {
44-
publishLibraryVariants("release")
45-
}
43+
// androidTarget {
44+
// publishLibraryVariants("release")
45+
// }
4646

4747
sourceSets {
4848
commonMain {
@@ -76,71 +76,71 @@ kotlin {
7676
}
7777
}
7878

79-
named("androidMain") {
80-
dependencies {
81-
compileOnly("org.jetbrains.lets-plot:commons:$letsPlotVersion")
82-
compileOnly("org.jetbrains.lets-plot:datamodel:$letsPlotVersion")
83-
compileOnly("org.jetbrains.lets-plot:canvas:$letsPlotVersion")
84-
compileOnly("org.jetbrains.lets-plot:plot-base:$letsPlotVersion")
85-
compileOnly("org.jetbrains.lets-plot:plot-builder:$letsPlotVersion")
86-
compileOnly("org.jetbrains.lets-plot:plot-stem:$letsPlotVersion")
87-
compileOnly("org.jetbrains.lets-plot:plot-raster:$letsPlotVersion")
88-
}
89-
}
90-
91-
named("androidInstrumentedTest") {
92-
dependencies {
93-
implementation(kotlin("test"))
94-
implementation("androidx.test.ext:junit:1.1.5")
95-
implementation("androidx.test.espresso:espresso-core:3.5.1")
96-
97-
implementation("org.assertj:assertj-core:$assertjVersion")
98-
implementation("org.jetbrains.lets-plot:commons:$letsPlotVersion")
99-
implementation("org.jetbrains.lets-plot:datamodel:$letsPlotVersion")
100-
implementation("org.jetbrains.lets-plot:canvas:$letsPlotVersion")
101-
implementation("org.jetbrains.lets-plot:plot-base:$letsPlotVersion")
102-
implementation("org.jetbrains.lets-plot:plot-builder:$letsPlotVersion")
103-
implementation("org.jetbrains.lets-plot:plot-stem:$letsPlotVersion")
104-
implementation("org.jetbrains.lets-plot:plot-raster:$letsPlotVersion")
105-
}
106-
}
79+
// named("androidMain") {
80+
// dependencies {
81+
// compileOnly("org.jetbrains.lets-plot:commons:$letsPlotVersion")
82+
// compileOnly("org.jetbrains.lets-plot:datamodel:$letsPlotVersion")
83+
// compileOnly("org.jetbrains.lets-plot:canvas:$letsPlotVersion")
84+
// compileOnly("org.jetbrains.lets-plot:plot-base:$letsPlotVersion")
85+
// compileOnly("org.jetbrains.lets-plot:plot-builder:$letsPlotVersion")
86+
// compileOnly("org.jetbrains.lets-plot:plot-stem:$letsPlotVersion")
87+
// compileOnly("org.jetbrains.lets-plot:plot-raster:$letsPlotVersion")
88+
// }
89+
// }
90+
91+
// named("androidInstrumentedTest") {
92+
// dependencies {
93+
// implementation(kotlin("test"))
94+
// implementation("androidx.test.ext:junit:1.1.5")
95+
// implementation("androidx.test.espresso:espresso-core:3.5.1")
96+
//
97+
// implementation("org.assertj:assertj-core:$assertjVersion")
98+
// implementation("org.jetbrains.lets-plot:commons:$letsPlotVersion")
99+
// implementation("org.jetbrains.lets-plot:datamodel:$letsPlotVersion")
100+
// implementation("org.jetbrains.lets-plot:canvas:$letsPlotVersion")
101+
// implementation("org.jetbrains.lets-plot:plot-base:$letsPlotVersion")
102+
// implementation("org.jetbrains.lets-plot:plot-builder:$letsPlotVersion")
103+
// implementation("org.jetbrains.lets-plot:plot-stem:$letsPlotVersion")
104+
// implementation("org.jetbrains.lets-plot:plot-raster:$letsPlotVersion")
105+
// }
106+
// }
107107
}
108108
}
109109

110-
android {
111-
namespace = "org.jetbrains.letsPlot.android.canvas"
112-
113-
compileSdk = (findProperty("android.compileSdk") as String).toInt()
114-
115-
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
116-
117-
defaultConfig {
118-
minSdk = (findProperty("android.minSdk") as String).toInt()
119-
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
120-
}
121-
122-
testOptions {
123-
124-
// animationsDisabled = true
125-
// execution = "ANDROIDX_TEST_ORCHESTRATOR"
126-
}
127-
128-
buildTypes {
129-
getByName("release") {
130-
isMinifyEnabled = false // true - error: when compiling demo cant resolve classes
131-
// proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
132-
}
133-
}
134-
135-
compileOptions {
136-
sourceCompatibility = JavaVersion.VERSION_11
137-
targetCompatibility = JavaVersion.VERSION_11
138-
}
139-
140-
kotlin {
141-
jvmToolchain(11)
142-
}
143-
}
110+
//android {
111+
// namespace = "org.jetbrains.letsPlot.android.canvas"
112+
//
113+
// compileSdk = (findProperty("android.compileSdk") as String).toInt()
114+
//
115+
// sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
116+
//
117+
// defaultConfig {
118+
// minSdk = (findProperty("android.minSdk") as String).toInt()
119+
// testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
120+
// }
121+
//
122+
// testOptions {
123+
//
124+
// // animationsDisabled = true
125+
// // execution = "ANDROIDX_TEST_ORCHESTRATOR"
126+
// }
127+
//
128+
// buildTypes {
129+
// getByName("release") {
130+
// isMinifyEnabled = false // true - error: when compiling demo cant resolve classes
131+
//// proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
132+
// }
133+
// }
134+
//
135+
// compileOptions {
136+
// sourceCompatibility = JavaVersion.VERSION_11
137+
// targetCompatibility = JavaVersion.VERSION_11
138+
// }
139+
//
140+
// kotlin {
141+
// jvmToolchain(11)
142+
// }
143+
//}
144144

145145
tasks.register("pullDebugImages") {
146146
doLast {

‎settings.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ include("demo-plot-swing")
6565
project(":demo-plot-swing").projectDir = File("./demo/plot/swing")
6666

6767
// Android SVG
68-
include("android-svg-view")
69-
project(":android-svg-view").projectDir = File("./demo/android-svg-view")
68+
//include("android-svg-view")
69+
//project(":android-svg-view").projectDir = File("./demo/android-svg-view")
7070

7171
// Android Plot Min
72-
include("android-plot-view")
73-
project(":android-plot-view").projectDir = File("./demo/android-plot-view")
72+
//include("android-plot-view")
73+
//project(":android-plot-view").projectDir = File("./demo/android-plot-view")
7474

7575

7676
/*

0 commit comments

Comments
 (0)