diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..16c2d92 --- /dev/null +++ b/build.gradle @@ -0,0 +1,58 @@ +plugins { + id 'java-library' + id 'maven-publish' + id 'net.woggioni.gradle.lombok' +} + +group = "net.woggioni" +version = getProperty("jzstd.version") + +allprojects { + repositories { + maven { + url = 'https://woggioni.net/mvn/' + } + mavenCentral() + } +} + +lombok { + version = getProperty('lombok.version') +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +dependencies { + implementation group: "net.java.dev.jna", name: "jna", version: getProperty("jna.version") + + testRuntimeOnly group: "org.junit.jupiter", name: "junit-jupiter-engine", version: getProperty("junit.version") + testImplementation group: "org.junit.jupiter", name: "junit-jupiter-api", version: getProperty("junit.version") + testImplementation group: "org.junit.jupiter", name: "junit-jupiter-params", version: getProperty("junit.version") +} + +tasks.withType(Test) { + useJUnitPlatform() +} + +wrapper { + distributionType = Wrapper.DistributionType.BIN + gradleVersion = getProperty('gradle.version') +} + +publishing { + repositories { + maven { + url = 'https://mvn.woggioni.net/' + } + } + publications { + maven(MavenPublication) { + from(components["java"]) + } + } +} + + diff --git a/build.gradle.kts b/build.gradle.kts deleted file mode 100644 index 14cf7aa..0000000 --- a/build.gradle.kts +++ /dev/null @@ -1,44 +0,0 @@ -plugins { - `java-library` - `maven-publish` -} - -group = "net.woggioni" -version = "0.1" - -allprojects { - repositories { - mavenLocal() - jcenter() - mavenCentral() - } -} - -fun property(name : String) = project.property(name).toString() - -dependencies { - implementation("net.java.dev.jna", "jna", property("jna.version")) - - compileOnly("org.projectlombok", "lombok", property("lombok.version")) - annotationProcessor("org.projectlombok", "lombok", property("lombok.version")) - - testCompileOnly("org.projectlombok", "lombok", property("lombok.version")) - testAnnotationProcessor("org.projectlombok", "lombok", property("lombok.version")) - testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", property("junit.version")) - testImplementation("org.junit.jupiter","junit-jupiter-api", property("junit.version")) - testImplementation("org.junit.jupiter","junit-jupiter-params", property("junit.version")) -} - -tasks.withType { - useJUnitPlatform() -} - -publishing { - publications { - create("maven") { - from(components["java"]) - } - } -} - - diff --git a/cli/build.gradle b/cli/build.gradle new file mode 100644 index 0000000..ea2af0c --- /dev/null +++ b/cli/build.gradle @@ -0,0 +1,42 @@ +plugins { + id "org.jetbrains.kotlin.jvm" + id "application" +} + +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +dependencies { + implementation group:"org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: getProperty("kotlin.version") + + implementation group: "org.apache.logging.log4j", name: "log4j-slf4j-impl", version: property("log4j.version") + implementation group: "org.slf4j", name: "slf4j-api", version: property("slf4j.version") + implementation group: "com.beust", name: "jcommander", version: property("jcommander.version") + implementation rootProject + + testRuntimeOnly group: "org.junit.jupiter", name: "junit-jupiter-engine", version: property("junit.version") + testImplementation group: "org.junit.jupiter", name: "junit-jupiter-api", version: property("junit.version") + testImplementation group: "org.junit.jupiter", name: "junit-jupiter-params", version: property("junit.version") +} + +application { + mainClassName = "net.woggioni.jzstd.Cli" +} + + +tasks.withType(Test) { + useJUnitPlatform() +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +tasks.withType(KotlinCompile.class).configureEach { + kotlinOptions { + languageVersion = "1.5" + apiVersion = "1.5" + jvmTarget = "1.8" + javaParameters = true + } +} diff --git a/cli/build.gradle.kts b/cli/build.gradle.kts deleted file mode 100644 index 58aa1cf..0000000 --- a/cli/build.gradle.kts +++ /dev/null @@ -1,48 +0,0 @@ -plugins { - id("org.jetbrains.kotlin.jvm") version "1.4.10" - application -} - -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - -fun property(name : String) = project.property(name).toString() - -dependencies { - // Align versions of all Kotlin components - implementation(platform("org.jetbrains.kotlin:kotlin-bom")) - - // Use the Kotlin JDK 8 standard library. - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") - - implementation("org.apache.logging.log4j", "log4j-slf4j-impl", property("log4j.version")) - implementation("org.slf4j", "slf4j-api", property("slf4j.version")) - implementation("com.beust", "jcommander", property("jcommander.version")) - implementation(project(":")) - - testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", property("junit.version")) - testImplementation("org.junit.jupiter","junit-jupiter-api", property("junit.version")) - testImplementation("org.junit.jupiter","junit-jupiter-params", property("junit.version")) -} - -application { - mainClassName = "net.woggioni.jzstd.Cli" -} - - -tasks.withType { - useJUnitPlatform() -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - -tasks.withType().configureEach { - kotlinOptions { - languageVersion = "1.4" - apiVersion = "1.4" - jvmTarget = "1.8" - javaParameters = true // Useful for reflection. - } -} diff --git a/gradle.properties b/gradle.properties index 52559b9..a15bdad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,10 @@ -junit.version=5.6.2 -lombok.version=1.18.16 -jna.version=5.5.0 -kotlin.version=1.3.70 -jcommander.version=1.78 -slf4j.version=1.7.30 -log4j.version=2.13.2 -net.woggioni.plugins.version=0.1 +jzstd.version = 0.1 +gradle.version = 7.1 +kotlin.version = 1.5.20 +junit.version = 5.6.2 +lombok.version = 1.18.16 +jna.version = 5.5.0 +jcommander.version = 1.78 +slf4j.version = 1.7.30 +log4j.version = 2.13.2 +net.woggioni.plugins.version = 0.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf..69a9715 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..1cfe5c6 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,17 @@ +pluginManagement { + repositories { + maven { + url = 'https://woggioni.net/mvn/' + } + gradlePluginPortal() + } + + plugins { + id "net.woggioni.gradle.lombok" version "0.1" + id "org.jetbrains.kotlin.jvm" version getProperty("kotlin.version") + } +} + +rootProject.name = "jzstd" + +include("cli") diff --git a/settings.gradle.kts b/settings.gradle.kts deleted file mode 100644 index d7a81b7..0000000 --- a/settings.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -pluginManagement { - plugins { - `java-library` apply false - `maven-publish` apply false - } -} - -rootProject.name = "jzstd" - -include("cli")