Skip to content

Commit

Permalink
Updated dependencies and added license task
Browse files Browse the repository at this point in the history
  • Loading branch information
blootsvoets committed Jul 3, 2023
1 parent f30a69b commit e567cf0
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 22 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ jobs:
# Compile code
- name: Compile code
run: ./gradlew assemble
run: ./gradlew assemble collectLicenses

# Upload it to GitHub
- name: Upload to GitHub
uses: AButler/upload-release-assets@v2.0
uses: AButler/upload-release-assets@v2.0.2
with:
files: 'radar-commons*/build/libs/*'
files: 'radar-commons*/build/libs/*;radar-commons*/build/reports/*.tar.gz'
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Install gpg secret key
Expand Down
20 changes: 10 additions & 10 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ object Versions {
const val project = "1.0.1-SNAPSHOT"

object Plugins {
const val kotlin = "1.8.21"
const val kotlin = "1.8.22"
const val kotlinSerialization = kotlin
const val avro = "1.7.0"
const val avro = "1.7.1"
}

const val java = 11
const val slf4j = "2.0.7"
const val confluent = "7.3.2"
const val kafka = "7.3.2-ce"
const val confluent = "7.4.0"
const val kafka = "7.4.0-ce"
const val avro = "1.11.1"
const val jackson = "2.15.0"
const val jackson = "2.15.2"
const val okhttp = "4.11.0"
const val junit = "5.9.3"
const val mockito = "5.3.1"
const val mockitoKotlin = "4.1.0"
const val mockito = "5.4.0"
const val mockitoKotlin = "5.0.0"
const val hamcrest = "2.2"
const val radarSchemas = "0.8.2"
const val radarSchemas = "0.8.4"
const val opencsv = "5.7.1"
const val ktor = "2.3.0"
const val coroutines = "1.6.4"
const val ktor = "2.3.2"
const val coroutines = "1.7.2"
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,13 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
Expand Down
9 changes: 5 additions & 4 deletions radar-commons-gradle/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ repositories {
}

dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.8.10")
implementation("com.github.ben-manes:gradle-versions-plugin:0.46.0")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22")
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.8.20")
implementation("com.github.ben-manes:gradle-versions-plugin:0.47.0")
implementation("io.github.gradle-nexus:publish-plugin:1.3.0")
implementation("org.jlleitschuh.gradle:ktlint-gradle:11.3.2")
implementation("org.jlleitschuh.gradle:ktlint-gradle:11.4.2")
implementation("com.github.jk1.dependency-license-report:com.github.jk1.dependency-license-report.gradle.plugin:2.5")
}

gradlePlugin {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package org.radarbase.gradle.plugin

import com.github.jk1.license.LicenseReportPlugin
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.plugins.ApplicationPlugin
import org.gradle.api.plugins.JavaApplication
import org.gradle.api.provider.Property
import org.gradle.api.tasks.Copy
import org.gradle.api.tasks.bundling.Compression
import org.gradle.api.tasks.bundling.Tar
import org.gradle.api.tasks.compile.JavaCompile
import org.gradle.api.tasks.testing.Test
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
Expand Down Expand Up @@ -123,6 +126,19 @@ class RadarKotlinPlugin : Plugin<Project> {
}
}

apply<LicenseReportPlugin>()

tasks.register<Tar>("collectLicenses") {
from(
fileTree("$buildDir/reports/dependency-license"),
rootDir.resolve("LICENSE"),
)
compression = Compression.GZIP
destinationDirectory.set(file("$buildDir/reports"))
archiveBaseName.set("${project.name}-dependency-license")
dependsOn(tasks["generateLicenseReport"])
}

afterEvaluate {
if (extension.slf4jVersion.isPresent) {
dependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.radarbase.gradle.plugin

object Versions {
const val wrapper = "8.1.1"
const val kotlin = "1.8.21"
const val ktlint = "0.48.2"
const val wrapper = "8.2"
const val kotlin = "1.8.22"
const val ktlint = "0.50.0"
const val java = 11
const val junit = "5.9.3"
}

0 comments on commit e567cf0

Please sign in to comment.