Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade gradle to 8.7 #30

Merged
merged 3 commits into from
May 21, 2024
Merged
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
16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,21 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [0.2.5]() (Upcoming)
# [0.4.0]() (Upcoming)

### Bug Fixes

* NIL

### Features

*

### BREAKING CHANGES

* Updated Gradle to 8.7 [#30](https://github.com/hyperledger/web3j-sokt/pull/30)

# [0.3.0](https://github.com/hyperledger/web3j-sokt/releases/tag/v0.3.0) (2024-04-17)

### Bug Fixes

Expand Down
24 changes: 12 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.8.10'
ext.kotlin_version = '1.9.24'
repositories { jcenter() }

dependencies {
Expand All @@ -12,16 +12,16 @@ plugins {
id 'idea'
id 'jacoco'
id "com.jfrog.bintray" version "1.8.4"
id "com.diffplug.gradle.spotless" version "4.5.1"
id 'io.codearte.nexus-staging' version '0.21.1'
id "com.diffplug.spotless" version "6.25.0"
id 'io.codearte.nexus-staging' version '0.30.0'
id "de.marcphilipp.nexus-publish" version "0.4.0"
id 'org.jetbrains.kotlin.jvm' version '1.8.10'
id 'org.jetbrains.kotlin.jvm' version "$kotlin_version"
id 'de.undercouch.download' version '4.1.2'
id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.10'
id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlin_version"
}

jacoco {
toolVersion = "0.8.7"
toolVersion = "0.8.10"
}

description 'web3j-sokt - Kotlin-based wrapper for multiple installations of the solidity compiler (solc)'
Expand Down Expand Up @@ -59,12 +59,12 @@ repositories {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8",
"org.apache.commons:commons-lang3:3.0",
"com.github.zafarkhaja:java-semver:0.9.0",
"org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.3",
"org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3",
"org.jetbrains.kotlin:kotlin-serialization:1.8.10"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version",
"org.apache.commons:commons-lang3:3.14.0",
"com.github.zafarkhaja:java-semver:0.10.2",
"org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3",
"org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3",
"org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
testImplementation "org.junit.jupiter:junit-jupiter-engine:$junitVersion",
"org.junit.jupiter:junit-jupiter-api:$junitVersion",
"org.junit.jupiter:junit-jupiter-params:$junitVersion"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
kotlin.code.style=official
version=0.2.5-SNAPSHOT
version=0.4.0-SNAPSHOT
4 changes: 3 additions & 1 deletion gradle/jacoco/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ task jacocoRootTestReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
getAdditionalSourceDirs().from(subprojects.sourceSets.main.allSource.srcDirs)
getClassDirectories().from(subprojects.sourceSets.main.output)
getExecutionData().from(subprojects.jacocoTestReport.executionData)
reports { xml.enabled = true }
reports {
xml.required.set(true)
}

doFirst {
getExecutionData().from(executionData.findAll { it.exists() })
Expand Down
23 changes: 19 additions & 4 deletions gradle/spotless/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

apply plugin: 'com.diffplug.gradle.spotless'
apply plugin: 'com.diffplug.spotless'
apply plugin: "de.undercouch.download"

task downloadJavaLicense(type: Download) {
Expand All @@ -26,7 +26,7 @@ spotless {
exclude '**/build/install/**'
}
removeUnusedImports()
googleJavaFormat("1.7").aosp()
googleJavaFormat("1.17.0").aosp()
importOrder 'java', '', 'org.web3j', '\\#'
trimTrailingWhitespace()
endWithNewline()
Expand All @@ -39,7 +39,7 @@ spotless {
exclude '**/.gradle/**'
exclude '**/build/install/**'
}
ktlint('0.31.0')
ktlint('0.49.1')
trimTrailingWhitespace()
endWithNewline()
licenseHeaderFile "$rootDir/gradle/spotless/java.license"
Expand All @@ -52,4 +52,19 @@ spotless {
}
}

spotlessCheck.dependsOn('downloadJavaLicense', 'downloadFormatterProperties')
tasks.named('spotlessJava') {
dependsOn downloadJavaLicense, downloadFormatterProperties
dependsOn tasks.named('compileJava'), tasks.named('compileTestJava'), tasks.named('processResources'), tasks.named('processTestResources')
mustRunAfter tasks.named('spotlessGroovyGradle'), tasks.named('test'), tasks.named('jacocoTestReport')
}

tasks.named('spotlessKotlin') {
dependsOn downloadJavaLicense, downloadFormatterProperties
dependsOn tasks.named('compileJava'), tasks.named('compileTestJava'), tasks.named('processResources'), tasks.named('processTestResources'), tasks.named('spotlessJava')
mustRunAfter tasks.named('spotlessGroovyGradle'), tasks.named('test'), tasks.named('jacocoTestReport')
}

tasks.named('spotlessCheck') {
dependsOn downloadJavaLicense, downloadFormatterProperties, tasks.named('spotlessJava'), tasks.named('spotlessKotlin'), tasks.named('spotlessGroovyGradle')
mustRunAfter tasks.named('jacocoTestReport'), tasks.named('test')
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 4 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Thu Mar 05 14:16:43 GMT 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading