Skip to content

Commit

Permalink
Update build dependencies (#413)
Browse files Browse the repository at this point in the history
* Upgrade Gradle 4.10.3 -> 8.8
* Replace osgi plugin with bnd plugin
* Use consistent quoting
* Upgrade JUnit 5.8.2 -> 5.10.3
* Fix gradle deprecation warning
* Upgrade checkstyle 6.18 -> 9.3
  • Loading branch information
tumbarumba authored Jul 5, 2024
1 parent ca5c3c4 commit 776d17a
Show file tree
Hide file tree
Showing 7 changed files with 261 additions and 166 deletions.
21 changes: 12 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
apply plugin: 'signing'
apply plugin: 'osgi'
apply plugin: 'maven-publish'
plugins {
id "signing"
id "maven-publish"
}

group = "org.hamcrest"
version = "3.0-SNAPSHOT"
Expand All @@ -9,19 +10,21 @@ subprojects {
apply plugin: 'checkstyle'
apply plugin: 'java-library'

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

group = rootProject.group
version = rootProject.version

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

repositories {
mavenCentral()
}

checkstyle {

project.ext.checkstyleVersion = '6.18'
project.ext.checkstyleVersion = '9.3'
//works with a JDK 7 version which is supposed to be supported although
//deprecated, see https:/hamcrest/JavaHamcrest/pull/211 for
//the discussion about the support
Expand All @@ -47,12 +50,12 @@ subprojects {
}

task sourcesJar(type: Jar) {
classifier = 'sources'
archiveClassifier = 'sources'
from sourceSets.main.allSource
}

task javadocJar(type: Jar) {
classifier = 'javadoc'
archiveClassifier = 'javadoc'
from javadoc
}
}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 776d17a

Please sign in to comment.