temporary commit2

This commit is contained in:
2023-10-03 19:53:24 +08:00
parent 1747d946ec
commit e75a0e551b
13 changed files with 63 additions and 41 deletions

View File

@@ -2,9 +2,9 @@ plugins {
id 'maven-publish' id 'maven-publish'
alias catalog.plugins.envelope apply false alias catalog.plugins.envelope apply false
alias catalog.plugins.lombok apply false alias catalog.plugins.lombok apply false
alias catalog.plugins.multi.release.jar
} }
allprojects { allprojects {
apply plugin: 'java-library' apply plugin: 'java-library'
apply plugin: catalog.plugins.lombok.get().pluginId apply plugin: catalog.plugins.lombok.get().pluginId
@@ -12,6 +12,10 @@ allprojects {
group = "net.woggioni" group = "net.woggioni"
version = getProperty('wson.version') version = getProperty('wson.version')
java {
modularity.inferModulePath = true
}
lombok { lombok {
version = catalog.versions.lombok.get() version = catalog.versions.lombok.get()
} }
@@ -39,11 +43,20 @@ allprojects {
test { test {
useJUnitPlatform() useJUnitPlatform()
} }
tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
options.release = 17
}
pluginManager.withPlugin(catalog.plugins.kotlin.jvm.get().pluginId) {
compileKotlin {
kotlinOptions.with {
jvmTarget = '17'
}
}
}
} }
ext {
setProperty('jpms.module.name', 'net.woggioni.wson')
}
dependencies { dependencies {
implementation catalog.jwo implementation catalog.jwo

View File

@@ -31,7 +31,15 @@ dependencyResolutionManagement {
rootProject.name = 'wson' rootProject.name = 'wson'
def includeDirs = ['antlr', 'benchmark', 'test-utils', 'wson-cli', 'wson-w3c-json', 'wcfg'] def includeDirs = [
'antlr',
'benchmark',
'test-utils',
'wson-cli',
'wson-w3c-json',
'wcfg',
'wcfg-cli'
]
includeDirs.each { includeDirs.each {
include(it) include(it)

View File

@@ -1,4 +1,5 @@
module net.woggioni.wson { module net.woggioni.wson {
requires static lombok;
requires net.woggioni.jwo; requires net.woggioni.jwo;
exports net.woggioni.wson.xface; exports net.woggioni.wson.xface;
@@ -7,4 +8,5 @@ module net.woggioni.wson {
exports net.woggioni.wson.serialization; exports net.woggioni.wson.serialization;
exports net.woggioni.wson.serialization.json; exports net.woggioni.wson.serialization.json;
exports net.woggioni.wson.serialization.binary; exports net.woggioni.wson.serialization.binary;
exports net.woggioni.wson.traversal;
} }

View File

@@ -1,10 +0,0 @@
module net.woggioni.wson {
requires net.woggioni.jwo;
exports net.woggioni.wson.xface;
exports net.woggioni.wson.value;
exports net.woggioni.wson.exception;
exports net.woggioni.wson.serialization;
exports net.woggioni.wson.serialization.json;
exports net.woggioni.wson.serialization.binary;
}

12
wcfg-cli/build.gradle Normal file
View File

@@ -0,0 +1,12 @@
plugins {
alias(catalog.plugins.envelope)
}
dependencies {
implementation catalog.picocli
implementation project(':wcfg')
}
envelopeJar {
mainClass = 'net.woggioni.wson.wcfg.cli.Main'
}

View File

@@ -0,0 +1,3 @@
module net.woggioni.wson.wcfg.cli {
requires net.woggioni.wson.wcfg;
}

View File

@@ -0,0 +1,7 @@
package net.woggioni.wson.wcfg.cli;
public class Main {
public void main(String[] args) {
System.out.println();
}
}

View File

@@ -13,4 +13,4 @@ dependencies {
generateGrammarSource { generateGrammarSource {
maxHeapSize = "64m" maxHeapSize = "64m"
arguments += ['-package', 'net.woggioni.wson.wcfg'] arguments += ['-package', 'net.woggioni.wson.wcfg']
} }

View File

@@ -0,0 +1,8 @@
module net.woggioni.wson.wcfg {
requires static lombok;
requires static org.antlr.antlr4.runtime;
requires net.woggioni.jwo;
requires net.woggioni.wson;
exports net.woggioni.wson.wcfg;
}

View File

@@ -7,6 +7,7 @@ import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CodePointCharStream; import org.antlr.v4.runtime.CodePointCharStream;
import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.tree.ParseTreeWalker; import org.antlr.v4.runtime.tree.ParseTreeWalker;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource; import org.junit.jupiter.params.provider.ValueSource;

View File

@@ -1,4 +1,6 @@
value1 := { value1 := {
"key" : "value", "key" : "value",
"myself" : value1 "myself" : value1
}; };
value2 := [value1];

View File

@@ -2,11 +2,6 @@ plugins {
id 'maven-publish' id 'maven-publish'
alias catalog.plugins.envelope alias catalog.plugins.envelope
alias catalog.plugins.kotlin.jvm alias catalog.plugins.kotlin.jvm
alias catalog.plugins.multi.release.jar
}
ext {
setProperty('jpms.module.name', 'net.woggioni.wson.cli')
} }
dependencies { dependencies {
@@ -21,16 +16,6 @@ envelopeJar {
mainModule = 'net.woggioni.wson.cli' mainModule = 'net.woggioni.wson.cli'
} }
java {
modularity.inferModulePath = true
}
compileKotlin {
kotlinOptions.with {
jvmTarget = '1.8'
}
}
publishing { publishing {
repositories { repositories {
maven { maven {
@@ -44,8 +29,3 @@ publishing {
} }
} }
tasks.register('listConfigurations') {
configurations.each {
println(it.name)
}
}

View File

@@ -1,4 +0,0 @@
package net.woggioni.wson.cli;
public class Foo {
}