diff --git a/api/build.gradle b/api/build.gradle index 32b37d1..8a11427 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -7,6 +7,7 @@ plugins { repositories { mavenCentral() + mavenLocal() } configurations { @@ -17,10 +18,10 @@ configurations { dependencies { api libs.groovy + api libs.groowt.all compileOnlyApi libs.jetbrains.anontations - api libs.groovy implementation libs.groovy.templates implementation libs.commonmark implementation libs.commonmark.frontmatter diff --git a/buildSrc/src/main/groovy/ssg-common.gradle b/buildSrc/src/main/groovy/ssg-common.gradle index cb6589c..4cc64fb 100644 --- a/buildSrc/src/main/groovy/ssg-common.gradle +++ b/buildSrc/src/main/groovy/ssg-common.gradle @@ -29,6 +29,12 @@ dependencies { testing libs.mockito.junit.jupiter } +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + testing { suites { test { diff --git a/cli/build.gradle b/cli/build.gradle index fb914f1..2ef39b4 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -6,6 +6,7 @@ plugins { repositories { mavenCentral() + mavenLocal() } dependencies { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b8c5504..c51297d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,7 @@ [versions] commonmark = '0.22.0' groovy = '4.0.21' +groowt = '0.1.0' log4j2 = '2.23.1' mockito = '5.12.0' junit = '5.10.2' @@ -10,6 +11,7 @@ commonmark = { module = 'org.commonmark:commonmark', version.ref = 'commonmark' commonmark-frontmatter = { module = 'org.commonmark:commonmark-ext-yaml-front-matter', version.ref = 'commonmark' } groovy = { module = 'org.apache.groovy:groovy', version.ref = 'groovy' } groovy-templates = { module = 'org.apache.groovy:groovy-templates', version.ref = 'groovy' } +groowt-all = { module = 'groowt:groowt-all', version.ref = 'groowt' } jetbrains-anontations = 'org.jetbrains:annotations:24.1.0' jsoup = 'org.jsoup:jsoup:1.17.2' junit-jupiter-api = { module = 'org.junit.jupiter:junit-jupiter-api', version.ref = 'junit' } diff --git a/ssg-0.4.0.md b/ssg-0.4.0.md index 2ff93d2..43e5469 100644 --- a/ssg-0.4.0.md +++ b/ssg-0.4.0.md @@ -26,3 +26,8 @@ Have the following layout of dirs and files. It is a combined gradle/ssg project - texts: a general folder for texts and other textual data, can be .md, .txt, .html, etc. - build.gradle: the root project build.gradle - settings.gradle: the usual gradle settings + +## Api TODO +- [ ] Move from `Provider`/`Property` in `api` to `groowt.util.provider`. +- [ ] Move from all the fp-util stuff to `groowt.util.fp`. +- [ ] Get rid of graph-dependency.