Updated version, updated dependencies

master
Robinson 2021-04-26 02:24:51 +02:00
parent 0d0689d90a
commit e2a2c316a6
2 changed files with 15 additions and 46 deletions

View File

@ -12,9 +12,3 @@
JetBrains s.r.o. and Kotlin Programming Language contributors
Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
- PropertyLoader - Property annotation and loader for fields
[The Apache Software License, Version 2.0]
https://git.dorkbox.com/dorkbox/PropertyLoader
Copyright 2021
Dorkbox LLC

View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import dorkbox.gradle.kotlin
import java.time.Instant
///////////////////////////////
@ -24,15 +23,12 @@ import java.time.Instant
///////////////////////////////
gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS // always show the stacktrace!
gradle.startParameter.warningMode = WarningMode.All
plugins {
java
id("com.dorkbox.GradleUtils") version "1.17"
id("com.dorkbox.Licensing") version "2.5.5"
id("com.dorkbox.GradleUtils") version "2.6"
id("com.dorkbox.Licensing") version "2.6.1"
id("com.dorkbox.VersionUpdate") version "2.3"
id("com.dorkbox.GradlePublish") version "1.10"
id("com.dorkbox.GradlePublish") version "1.11"
kotlin("jvm") version "1.4.32"
}
@ -41,7 +37,7 @@ object Extras {
// set for the project
const val description = "Software Update Management"
const val group = "com.dorkbox"
const val version = "1.0"
const val version = "1.1"
// set as project.ext
const val name = "Updates"
@ -53,13 +49,20 @@ object Extras {
val buildDate = Instant.now().toString()
}
///////////////////////////////
///// assign 'Extras'
///////////////////////////////
GradleUtils.load("$projectDir/../../gradle.properties", Extras)
GradleUtils.fixIntellijPaths()
GradleUtils.defaultResolutionStrategy()
GradleUtils.defaults()
GradleUtils.compileConfiguration(JavaVersion.VERSION_1_8)
GradleUtils.jpms(JavaVersion.VERSION_1_9)
// this will show warnings, but this is necessary if we want access
//GradleUtils.allowKotlinInternalAccessForTests("kotlin",
// dorkbox.gradle.StaticMethodsAndTools.AccessGroup(j9.mainX.name, j9.main.name),
// dorkbox.gradle.StaticMethodsAndTools.AccessGroup(j9.testX.name, j9.mainX.name, j9.main.name)
//)
licensing {
license(License.APACHE_2) {
@ -69,31 +72,6 @@ licensing {
}
}
sourceSets {
main {
kotlin {
setSrcDirs(listOf("src"))
// want to add files for the source. 'setSrcDirs' resets includes...
include("**/*.kt")
}
}
test {
kotlin {
setSrcDirs(listOf("test"))
// want to add files for the source. 'setSrcDirs' resets includes...
include("**/*.kt")
}
}
}
repositories {
mavenLocal() // this must be first!
jcenter()
}
tasks.jar.get().apply {
manifest {
// https://docs.oracle.com/javase/tutorial/deployment/jar/packageman.html
@ -106,17 +84,14 @@ tasks.jar.get().apply {
attributes["Implementation-Title"] = "${Extras.group}.${Extras.id}"
attributes["Implementation-Version"] = Extras.buildDate
attributes["Implementation-Vendor"] = Extras.vendor
attributes["Automatic-Module-Name"] = Extras.id
}
}
dependencies {
// MINIMAL DEPENDENCIES!
implementation("com.dorkbox:PropertyLoader:1.0")
// NO DEPENDENCIES!
testImplementation("junit:junit:4.13.2")
}
publishToSonatype {
groupId = Extras.group
artifactId = Extras.id