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
21 changes: 11 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id 'java'
id 'maven-publish'
id('com.github.hierynomus.license') version '0.14.0'
id('io.github.spencerpark.jupyter-kernel-installer') version '2.1.0'
id('com.github.hierynomus.license') version '0.16.1'
id('io.github.spencerpark.jupyter-kernel-installer') version '3.0.0-SNAPSHOT'
id('com.github.jk1.dependency-license-report')
}

Expand All @@ -15,7 +15,7 @@ group = 'io.github.spencerpark'
version = '1.3.0'

wrapper {
gradleVersion = '4.8.1'
gradleVersion = '7.4.2'
distributionType = Wrapper.DistributionType.ALL
}

Expand All @@ -28,7 +28,7 @@ license {
java = 'SLASHSTAR_STYLE'
}
}
build.dependsOn 'licenseFormat'
build.dependsOn 'licenseFormat'

// Configures the license report generated for the dependencies.
licenseReport {
Expand Down Expand Up @@ -56,7 +56,7 @@ configurations {
// transitive true to make sure that the dependencies of shade dependencies also get shaded
// into the jar
shade.transitive = true
compile.extendsFrom(shade)
implementation.extendsFrom(shade)
}

repositories {
Expand All @@ -74,13 +74,14 @@ dependencies {
//shade group: 'org.apache.maven', name: 'maven-settings-builder', version: '3.6.0'
shade group: 'org.apache.maven', name: 'maven-model-builder', version: '3.6.0'

testCompile group: 'junit', name: 'junit', version: '4.12'
testImplementation group: 'junit', name: 'junit', version: '4.12'
}

jar {
//Include all shaded dependencies in the jar
from configurations.shade
.collect { it.isDirectory() ? it : zipTree(it) }
//Include all shaded dependencies in the jar except META-INF to avoid conflicts
from(configurations.shade.collect { it.isDirectory() ? it : zipTree(it) }) {
exclude 'META-INF', 'META-INF/**'
}

manifest {
attributes('Main-class': 'io.github.spencerpark.ijava.IJava')
Expand Down Expand Up @@ -150,4 +151,4 @@ zipKernel {
into 'dependency-licenses'
}
}
zipKernel.dependsOn 'generateLicenseReport'
zipKernel.dependsOn 'generateLicenseReport'
2 changes: 1 addition & 1 deletion buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ repositories {
}

dependencies {
compile group: 'com.github.jk1.dependency-license-report', name: 'com.github.jk1.dependency-license-report.gradle.plugin', version: '1.1'
implementation group: 'com.github.jk1.dependency-license-report', name: 'com.github.jk1.dependency-license-report.gradle.plugin', version: '1.1'
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading