Skip to content

Commit fdb5f87

Browse files
holgerbrandlholgerbrandl
committed
v1.0 release
1 parent 14bb0a1 commit fdb5f87

11 files changed

+105
-147
lines changed

‎build.gradle

-136
This file was deleted.

‎build.gradle.kts

+92
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
plugins {
2+
kotlin("jvm") version "2.0.21"
3+
`maven-publish`
4+
signing
5+
6+
id("io.github.gradle-nexus.publish-plugin") version "1.2.0"
7+
id("org.jetbrains.kotlin.jupyter.api") version "0.12.0-285"
8+
}
9+
10+
11+
12+
group = "com.github.holgerbrandl"
13+
version = "1.0"
14+
15+
16+
repositories {
17+
mavenCentral()
18+
mavenLocal()
19+
}
20+
21+
dependencies {
22+
compileOnly("org.jetbrains.kotlin:kotlin-reflect:2.0.21")
23+
24+
api("org.jetbrains.kotlinx:dataframe-core:0.14.1")
25+
api("com.github.holgerbrandl:kdfutils:1.4.0")
26+
api("org.apache.commons:commons-math3:3.6.1")
27+
28+
implementation("org.rosuda.REngine:REngine:2.1.0")
29+
implementation("org.rosuda.REngine:Rserve:1.8.1")
30+
31+
testImplementation("junit:junit:4.13.1")
32+
testImplementation("io.kotest:kotest-assertions-core:5.0.3")
33+
testImplementation("org.jetbrains.kotlin:kotlin-script-runtime:2.0.21")
34+
}
35+
36+
tasks.processJupyterApiResources {
37+
libraryProducers = listOf("kravis.device.jupyter.JupyterIntegration")
38+
}
39+
40+
tasks.javadoc {
41+
exclude("**/PlotResultPanel.java")
42+
}
43+
44+
java {
45+
withJavadocJar()
46+
withSourcesJar()
47+
}
48+
49+
publishing {
50+
publications {
51+
create<MavenPublication>("mavenJava") {
52+
from(components["java"])
53+
pom {
54+
name.set("kravis")
55+
description.set("kravis is a Kotlin wrapper around ggplot2 to enable data visualization on the JVM")
56+
url.set("https://github.com/holgerbrandl/kravis")
57+
licenses {
58+
license {
59+
name.set("BSD-2")
60+
url.set("https://github.com/holgerbrandl/kravis/blob/master/LICENSE.txt")
61+
}
62+
}
63+
developers {
64+
developer {
65+
id.set("holgerbrandl")
66+
name.set("Holger Brandl")
67+
email.set("[email protected]")
68+
}
69+
}
70+
scm {
71+
connection.set("scm:git:github.com/holgerbrandl/kravis.git")
72+
developerConnection.set("scm:git:ssh://github.com/holgerbrandl/kravis.git")
73+
url.set("https://github.com/holgerbrandl/kravis.git")
74+
}
75+
}
76+
}
77+
}
78+
}
79+
80+
nexusPublishing {
81+
repositories {
82+
sonatype {
83+
snapshotRepositoryUrl.set(uri(project.findProperty("sonatypeStagingProfileId") ?: "not_defined"))
84+
username.set(project.findProperty("ossrhUsername")?.toString() ?: "not_defined")
85+
password.set(project.findProperty("ossrhPassword")?.toString() ?: "not_defined")
86+
}
87+
}
88+
}
89+
90+
signing {
91+
sign(publishing.publications["mavenJava"])
92+
}

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎modules/kravis-javafx/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ version = "0.5-SNAPSHOT"
1818

1919
repositories {
2020
mavenCentral()
21+
mavenLocal()
2122
}
2223

2324
dependencies {

‎settings.gradle ‎settings.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
rootProject.name = 'kravis'
1+
rootProject.name = "kravis"
22

33
include(":modules:kravis-javafx")

‎src/main/kotlin/kravis/IteratorApi.kt

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package kravis
22

3-
import com.github.holgerbrandl.kdfutils.toKotlinDF
4-
import krangl.deparseRecords
3+
import kravis.util.deparseRecords
54
import org.jetbrains.kotlinx.dataframe.datasets.sleepData
65
import org.jetbrains.kotlinx.dataframe.datasets.sleepPatterns
76
import skipNull
@@ -33,7 +32,7 @@ inline fun <reified T> Iterable<T>.plot(vararg aes2data: Pair<Aesthetic, PropExt
3332
val df = this.deparseRecords(*rulez.toList().toTypedArray())
3433

3534

36-
return GGPlot(data = df.toKotlinDF(), mapping = Aes(*aes.toTypedArray()))
35+
return GGPlot(data = df, mapping = Aes(*aes.toTypedArray()))
3736
}
3837

3938
/**
@@ -132,7 +131,7 @@ inline fun <reified T> Iterable<T>.plot(
132131
name to deparseFormula
133132
}
134133

135-
val deparsedReceiver = deparseRecords(*deparseFormulae.toTypedArray()).toKotlinDF()
134+
val deparsedReceiver = deparseRecords(*deparseFormulae.toTypedArray())
136135

137136

138137
// build new mapping

‎src/test/kotlin/kravis/ggplot/AbstractSvgPlotRegression.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ abstract class AbstractSvgPlotRegression {
8989
fun setup() {
9090
// SessionPrefs.RENDER_BACKEND = RserveEngine()
9191
// SessionPrefs.RENDER_BACKEND = Docker("holgerbrandl/kravis_core:3.5.1")
92-
// SessionPrefs.RENDER_BACKEND = LocalR()
93-
SessionPrefs.RENDER_BACKEND = Docker("kravis_test")
92+
SessionPrefs.RENDER_BACKEND = LocalR()
93+
// SessionPrefs.RENDER_BACKEND = Docker("kravis_test")
9494
}
9595
}
9696

‎src/test/kotlin/kravis/ggplot/CoreRegressions.kt

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import kravis.demo.IrisData.SepalWidth
77
import kravis.nshelper.plot
88
import kravis.plot
99
import org.jetbrains.kotlinx.dataframe.api.add
10+
import org.jetbrains.kotlinx.dataframe.api.aggregate
1011
import org.jetbrains.kotlinx.dataframe.api.groupBy
1112
import org.jetbrains.kotlinx.dataframe.api.mean
1213
import org.jetbrains.kotlinx.dataframe.datasets.irisData

‎src/test/kotlin/kravis/ggplot/GeomRegressions.kt

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import org.junit.Test
1616
import java.io.File
1717

1818

19-
@Suppress("UNUSED_EXPRESSION")
2019
/**
2120
* @author Holger Brandl
2221
*/

‎src/test/kotlin/kravis/samples/ExtractorPlots.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package kravis.samples
22

3-
import krangl.SleepPattern
43
import kravis.plot
54
import org.jetbrains.kotlinx.dataframe.api.head
65
import org.jetbrains.kotlinx.dataframe.api.print
76
import org.jetbrains.kotlinx.dataframe.api.toDataFrame
87
import org.jetbrains.kotlinx.dataframe.api.toListOf
8+
import org.jetbrains.kotlinx.dataframe.datasets.SleepPattern
99
import org.jetbrains.kotlinx.dataframe.datasets.sleepData
1010

1111
internal object ExtractorPlots {

‎src/test/kotlin/kravis/samples/SleepPatternsExample.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package kravis.samples
22

33
import kravis.GGPlot
4+
import kravis.SessionPrefs
45
import kravis.geomPoint
56
import kravis.plot
7+
import kravis.render.LocalR
68
import org.jetbrains.kotlinx.dataframe.datasets.SleepPattern
79
import org.jetbrains.kotlinx.dataframe.datasets.sleepPatterns
810
import kotlin.reflect.KProperty0
@@ -11,7 +13,7 @@ internal object SleepPatternsExample {
1113

1214
@JvmStatic
1315
fun main(args: Array<String>) {
14-
16+
SessionPrefs.RENDER_BACKEND = LocalR()
1517

1618
// extractor lambda
1719
sleepPatterns.plot(

0 commit comments

Comments
 (0)