Skip to content

Commit b4afc51

Browse files
committed
Dependencies centralisation 2
1 parent 08cb336 commit b4afc51

File tree

4 files changed

+35
-23
lines changed

4 files changed

+35
-23
lines changed

core/build.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import com.vanniktech.maven.publish.SonatypeHost
22

33
plugins {
44
id("java")
5-
id("com.vanniktech.maven.publish") version "0.30.0"
5+
alias(libs.plugins.mavenPublish)
66
}
77

88
group = "org.processing"
@@ -25,10 +25,10 @@ sourceSets{
2525
}
2626

2727
dependencies {
28-
implementation("org.jogamp.gluegen:gluegen-rt-main:2.5.0")
29-
implementation("org.jogamp.jogl:jogl-all-main:2.5.0")
28+
implementation(libs.jogl)
29+
implementation(libs.gluegen)
3030

31-
testImplementation("junit:junit:4.13.2")
31+
testImplementation(libs.junit)
3232
}
3333

3434
mavenPublishing{
@@ -56,9 +56,9 @@ mavenPublishing{
5656
}
5757
}
5858
scm{
59-
url.set("https://github.com/processing/processing4-carbon-aug-19")
60-
connection.set("scm:git:git://github.com/processing/processing4-carbon-aug-19.git")
61-
developerConnection.set("scm:git:ssh://[email protected]/processing/processing4-carbon-aug-19.git")
59+
url.set("https://github.com/processing/processing4")
60+
connection.set("scm:git:git://github.com/processing/processing4.git")
61+
developerConnection.set("scm:git:ssh://[email protected]/processing/processing4.git")
6262
}
6363
}
6464
}

gradle/libs.versions.toml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,30 @@
11
[versions]
22
kotlin = "2.0.20"
33
compose-plugin = "1.7.1"
4+
jogl = "2.5.0"
45

56
[libraries]
7+
jogl = { module = "org.jogamp.jogl:jogl-all-main", version.ref = "jogl" }
8+
gluegen = { module = "org.jogamp.gluegen:gluegen-rt-main", version.ref = "jogl" }
69
flatlaf = { module = "com.formdev:flatlaf", version = "3.4.1" }
710
jna = { module = "net.java.dev.jna:jna", version = "5.12.1" }
811
jnaplatform = { module = "net.java.dev.jna:jna-platform", version = "5.12.1" }
912
compottie = { module = "io.github.alexzhirkevich:compottie", version = "2.0.0-rc02" }
1013
kaml = { module = "com.charleskorn.kaml:kaml", version = "0.65.0" }
14+
junit = { module = "junit:junit", version = "4.13.2" }
15+
mockito = { module = "org.mockito:mockito-core", version = "4.11.0" }
16+
antlr = { module = "org.antlr:antlr4", version = "4.7.2" }
17+
eclipseJDT = { module = "org.eclipse.jdt:org.eclipse.jdt.core", version = "3.40.0" }
18+
classpathExplorer = { module = "com.google.classpath-explorer:classpath-explorer", version = "1.0" }
19+
netbeansSwing = { module = "org.netbeans.api:org-netbeans-swing-outline", version = "RELEASE210" }
20+
ant = { module = "org.apache.ant:ant", version = "1.10.14" }
21+
lsp4j = { module = "org.eclipse.lsp4j:org.eclipse.lsp4j", version = "0.22.0" }
22+
jsoup = { module = "org.jsoup:jsoup", version = "1.17.2" }
1123

1224
[plugins]
1325
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
1426
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
1527
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
1628
serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
17-
download = { id = "de.undercouch.download", version = "5.6.0" }
29+
download = { id = "de.undercouch.download", version = "5.6.0" }
30+
mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }

java/build.gradle.kts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ dependencies{
2727
implementation(project(":core"))
2828
implementation(project(":java:preprocessor"))
2929

30-
implementation("org.eclipse.jdt:org.eclipse.jdt.core:3.37.0")
31-
implementation("com.google.classpath-explorer:classpath-explorer:1.0")
32-
implementation("org.netbeans.api:org-netbeans-swing-outline:RELEASE210")
33-
implementation("org.apache.ant:ant:1.10.14")
34-
implementation("org.eclipse.lsp4j:org.eclipse.lsp4j:0.22.0")
35-
implementation("org.jsoup:jsoup:1.17.2")
36-
implementation("org.antlr:antlr4:4.7.2")
37-
38-
testImplementation("junit:junit:4.13.2")
39-
testImplementation("org.mockito:mockito-core:4.11.0")
30+
implementation(libs.eclipseJDT)
31+
implementation(libs.classpathExplorer)
32+
implementation(libs.netbeansSwing)
33+
implementation(libs.ant)
34+
implementation(libs.lsp4j)
35+
implementation(libs.jsoup)
36+
implementation(libs.antlr)
37+
38+
testImplementation(libs.junit)
39+
testImplementation(libs.mockito)
4040
}
4141

4242
tasks.compileJava{

java/preprocessor/build.gradle.kts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ import com.vanniktech.maven.publish.SonatypeHost
22

33
plugins{
44
id("java")
5-
id("com.vanniktech.maven.publish") version "0.30.0"
5+
alias(libs.plugins.mavenPublish)
66
}
77

88
group = "org.processing"
9-
version = "4.3.1"
109

1110
repositories{
1211
mavenCentral()
@@ -25,10 +24,10 @@ sourceSets{
2524
}
2625

2726
dependencies{
28-
implementation("org.antlr:antlr4:4.7.2")
29-
implementation("org.eclipse.jdt:org.eclipse.jdt.core:3.40.0")
27+
implementation(libs.antlr)
28+
implementation(libs.eclipseJDT)
3029

31-
implementation("org.processing:core:${version}")
30+
implementation(project(":core"))
3231
}
3332

3433
mavenPublishing{

0 commit comments

Comments
 (0)