Update to gradle 6.3 and kotlin 1.3.72 #45
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,8 @@ | ||
| /.idea | ||
| *.iml | ||
| .kobalt/ | ||
| .gradle/ | ||
| gradle.properties | ||
| kobaltw | ||
| build/ | ||
| out/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| import org.gradle.api.tasks.testing.logging.TestLogEvent | ||
|
|
||
| plugins { | ||
| kotlin("jvm") version "1.3.72" | ||
| maven | ||
| signing | ||
| } | ||
|
|
||
| group = "com.natpryce" | ||
| version = findProperty("-version") ?: "SNAPSHOT" | ||
|
|
||
| println("building version $version") | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
|
There was a problem hiding this comment. the buildscript repositories block was using jcenter(), which is a superset of mavenCentral(), but this one wasn't, so I left it as such |
||
| } | ||
|
|
||
| dependencies { | ||
| implementation(kotlin("stdlib")) | ||
|
There was a problem hiding this comment. the previous setup was using |
||
| implementation(kotlin("reflect")) | ||
|
|
||
| testImplementation(kotlin("test")) | ||
| testImplementation("junit:junit:4.12") | ||
| testImplementation("com.natpryce:hamkrest:1.4.0.0") | ||
| } | ||
|
|
||
| java { | ||
| withSourcesJar() | ||
|
There was a problem hiding this comment. new shortcut in recent gradle |
||
| } | ||
|
|
||
| tasks { | ||
| jar { | ||
| manifest { | ||
| attributes( | ||
| mapOf( | ||
| "Implementation-Title" to "konfig", | ||
| "Implementation-Vendor" to "com.natpryce", | ||
| "Implementation-Version" to project.version.toString() | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| test { | ||
| useJUnit() | ||
|
|
||
| testLogging { | ||
|
There was a problem hiding this comment. This seemed similar in spirit to the logging that was there before. It produces stuff like: with |
||
| events(TestLogEvent.PASSED, TestLogEvent.FAILED, TestLogEvent.SKIPPED) | ||
| } | ||
| } | ||
|
|
||
| register("ossrhAuthentication") { | ||
| doLast { | ||
| if (!(project.hasProperty("ossrh.username") && project.hasProperty("ossrh.password"))) { | ||
| throw InvalidUserDataException("no OSSRH username and/or password!") | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| artifacts { | ||
| add("archives", tasks["sourcesJar"]) | ||
| } | ||
|
|
||
| signing { | ||
| setRequired({ hasProperty("sign") || gradle.taskGraph.hasTask("uploadArchives") }) | ||
| listOf("jar", "sourcesJar").forEach { t -> sign(tasks[t]) } | ||
| } | ||
|
|
||
| apply(from = "publishing.gradle") | ||
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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-6.3-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My IDE wanted to add even more files, and also was having a slapfight with your IDE over the ones that were checked in. In my experience, having anything in .idea in VCS leads to discomfort.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For convenience
.idea(and all constantly ignored files and folders) should be included in a global.gitignorefile in the user home directory and be declared like this:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's one way of doing it, I suppose, but in my experience, the more behavior you can sqeeze into the repo itself, the better. I want to know that every clone of this repo will have the same ignored files the same way that I want them to all have the same source code.