Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
plugins {
id "biz.aQute.bnd.builder" version "5.0.1"
id "biz.aQute.bnd.builder" version "6.4.0"
id "com.diffplug.spotless" version "5.9.0"
}

apply plugin: 'java'
apply plugin: 'eclipse'
apply plugin: 'maven'
apply plugin: 'maven-publish'
apply plugin: 'signing'

[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
Expand All @@ -15,7 +15,6 @@ Properties props = new Properties()
props.load(new FileInputStream(buildDir.getAbsolutePath() + "/src/main/resources/com/neuronrobotics/nrjavaserial/build.properties"))

group = "com.neuronrobotics"
archivesBaseName = "nrjavaserial"
version = props."app.version"

sourceSets {
Expand All @@ -32,21 +31,21 @@ sourceSets {
}
}

jar.archiveName = "nrjavaserial-${props.'app.version'}.jar"

repositories {
mavenCentral()
jcenter()
}

dependencies {
compile fileTree(dir: 'libs', includes: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'commons-net:commons-net:3.9.0'
implementation fileTree(dir: 'build/libs', includes: ['*.jar'])
testImplementation 'junit:junit:4.12'
implementation 'commons-net:commons-net:3.9.0'
compileOnly 'net.java.dev.jna:jna:4.4.0'
compileOnly 'net.java.dev.jna:jna-platform:4.4.0'
}

compileTestJava.dependsOn jar

jar {
jar.duplicatesStrategy = DuplicatesStrategy.EXCLUDE

Expand All @@ -64,12 +63,13 @@ jar {
}

task javadocJar(type: Jar) {
classifier = 'javadoc'
archiveClassifier = 'javadoc'
from javadoc
}

task sourcesJar(type: Jar) {
classifier = 'sources'
archivesBaseName = "nrjavaserial"
archiveClassifier = 'sources'
from (sourceSets.main.allSource) {
exclude 'native/'
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading