Skip to content

Commit

Permalink
create version catalog
Browse files Browse the repository at this point in the history
  • Loading branch information
DeDiamondPro committed Jan 7, 2024
1 parent fabf4ab commit 638b37e
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 81 deletions.
10 changes: 3 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,9 @@ repositories {
}

dependencies {
implementation("org.commonmark:commonmark:0.21.0")
implementation("org.ccil.cowan.tagsoup:tagsoup:1.2.1")
implementation("org.jetbrains:annotations:24.0.0")

testImplementation(platform("org.junit:junit-bom:5.9.1"))
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.commonmark:commonmark-ext-gfm-strikethrough:0.21.0")
implementation(libs.commonmark)
implementation(libs.tagsoup)
compileOnly(libs.jetbrains.annotations)
}

allprojects {
Expand Down
10 changes: 5 additions & 5 deletions elementa/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
plugins {
// Lowest kotlin version that elementa supports
kotlin("jvm") version "1.6.10"
}

Expand All @@ -11,12 +12,11 @@ tasks.compileKotlin.configure {
}

repositories {
maven(url = "https://repo.essential.gg/repository/maven-public")
maven("https://repo.essential.gg/repository/maven-public")
}

dependencies {
implementation("gg.essential:elementa-1.8.9-forge:600")
compileOnly("org.lwjgl:lwjgl-opengl:3.3.1")
testImplementation(platform("org.junit:junit-bom:5.9.1"))
testImplementation("org.junit.jupiter:junit-jupiter")
implementation(libs.elementa)
implementation(libs.commonmark.ext.striketrough)
implementation(libs.commonmark.ext.tables)
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import gg.essential.elementa.UIComponent
import gg.essential.elementa.dsl.constrain
import gg.essential.elementa.dsl.pixels
import gg.essential.universal.UMatrixStack
import org.commonmark.ext.gfm.strikethrough.StrikethroughExtension
import org.commonmark.ext.gfm.tables.TablesExtension

class MineMarkComponent(
markdown: String,
Expand Down Expand Up @@ -72,6 +74,8 @@ class MineMarkComponent(
companion object {
private val defaultCore = MineMarkCore
.builder<MarkdownStyle, RenderData>()
.addExtension(StrikethroughExtension.create())
.addExtension(TablesExtension.create())
.addElementaExtensions()
.build()
}
Expand Down
25 changes: 25 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
[versions]
# Core
commonmark = "0.21.0"
tagsoup = "1.2.1"

# Annotations
jetbrains_annotations = "24.0.0"

# Elementa
elementa = "619"

[libraries]
# Commonmark
commonmark = { module = "org.commonmark:commonmark", version.ref = "commonmark" }
commonmark_ext_striketrough = { module = "org.commonmark:commonmark-ext-gfm-strikethrough", version.ref = "commonmark" }
commonmark_ext_tables = { module = "org.commonmark:commonmark-ext-gfm-tables", version.ref = "commonmark" }

# Tagsoup
tagsoup = { module = "org.ccil.cowan.tagsoup:tagsoup", version.ref = "tagsoup" }

# Annotations
jetbrains_annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains_annotations" }

# Elementa
elementa = { module = "gg.essential:elementa-1.8.9-forge", version.ref = "elementa" }
10 changes: 8 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
rootProject.name = "MineMark"
dependencyResolutionManagement {
versionCatalogs {
create("libs")
}
}

include(":elementa")
include(":elementa")

rootProject.name = "MineMark"
48 changes: 0 additions & 48 deletions src/test/java/BasicTest.java

This file was deleted.

19 changes: 0 additions & 19 deletions src/test/resources/test.md

This file was deleted.

0 comments on commit 638b37e

Please sign in to comment.