Skip to content

Updating build to gradle 6.1 and adding publishing options. #61

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.

Sign up for GitHub

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

Open
lbergelson wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Updating build to gradle 6.1 and adding publishing options. #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
319e0c2
Updating build to gradle 6.1 and adding publishing options.
lbergelson Jan 22, 2020
9c361e0
Change travis to use OpenJDK instead of Oracle in tests
lbergelson Jan 23, 2020
da78db2
Respond to first comments
lbergelson Jan 27, 2020
b4d1c59
use project.version when relevant, bump to 6.1.1
lbergelson Jan 27, 2020
359ed30
forgot wrapper update
lbergelson Jan 27, 2020
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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: java
git:
depth: 9999999
jdk:
- oraclejdk8
- openjdk8
env:
# disable gradle daemon
global:
Expand All @@ -28,4 +28,4 @@ script:

after_success:
# only upload to codecov for the tests
- if [[ $TYPE == test ]]; then bash <(curl -s https://codecov.io/bash) -X gcov -X coveragepy; fi
- if [[ $TYPE == test ]]; then bash <(curl -s https://codecov.io/bash) -X gcov -X coveragepy; fi
26 changes: 17 additions & 9 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,17 @@ buildscript {

// PLUGINS
plugins {
id "java"
id 'java-library'
id 'com.palantir.git-version' version "0.11.0"
}

// Apply the custom jacoco coverage plugin
apply from: 'gradle/jacoco.coverage.gradle'

group = 'org.magicdgs'
version gitVersion()

final isRelease = Boolean.getBoolean("release")
version = (isRelease ? gitVersion() : gitVersion() + "-SNAPSHOT")
Copy link
Copy Markdown
Owner

@magicDGS magicDGS Jan 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If in the manifest we are changing the variable, is this still valid? Shouldn't it be archiveVersion?

Copy link
Copy Markdown
Author

@lbergelson lbergelson Jan 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it gets propagated but maybe it's too confusing. In the jar plugin they've deprecated the jar.version and replaced it with jar.archiveVersion property which is initialized with project.version which is this. I think I'll use project.version in both places.

description = """HTTP/S FileSystem provider for Java NIO.2"""

// library dependencies
Expand All @@ -28,18 +30,23 @@ def slf4jVersion = "1.7.25"

dependencies {
// for logging, we use the SLF4J API
compile "org.slf4j:slf4j-api:" + slf4jVersion
implementation "org.slf4j:slf4j-api:" + slf4jVersion

// use TestNG for testing
testCompile "org.testng:testng:6.11"
testCompile "org.mockito:mockito-core:2.8.47"
testImplementation "org.testng:testng:6.11"
testImplementation "org.mockito:mockito-core:2.8.47"
// add SLF4J implementation for testing
testCompile "org.slf4j:slf4j-simple:" + slf4jVersion
testImplementation "org.slf4j:slf4j-simple:" + slf4jVersion
}

// for managing the wrapper task
wrapper {
gradleVersion = '4.9'
gradleVersion = '6.1.1'
}

java {
withJavadocJar()
withSourcesJar()
}

tasks.withType(Javadoc) {
Expand Down Expand Up @@ -116,7 +123,8 @@ tasks.withType(Jar) {
}
// add manifest information
manifest {
attributes 'Implementation-Title': rootProject.name,
'Implementation-Version': version
attributes 'Implementation-Title': project.name,
'Implementation-Version': project.version
}
}

Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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-4.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
51 changes: 31 additions & 20 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 17 additions & 1 deletion gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.