dorkbox
/
Licensing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated version dep

master
Robinson 2023-01-26 00:05:42 +01:00
parent 119c5c3491
commit 421ca60e4e
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
build.gradle.kts
View File

@ -24,9 +24,9 @@ plugins {
id("com.gradle.plugin-publish") version "1.1.0"
id("com.dorkbox.GradleUtils") version "3.6.2"
id("com.dorkbox.Licensing") version "2.18"
id("com.dorkbox.VersionUpdate") version "2.5"
id("com.dorkbox.GradleUtils") version "3.9"
// id("com.dorkbox.Licensing") version "2.18"
id("com.dorkbox.VersionUpdate") version "2.6"
kotlin("jvm") version "1.7.0"
}
@ -36,7 +36,7 @@ object Extras {
// set for the project
const val description = "License definitions and legal management plugin for the Gradle build system"
const val group = "com.dorkbox"
const val version = "2.19.1"
const val version = "2.19.2"
// set as project.ext
const val name = "Gradle Licensing Plugin"
@ -52,16 +52,15 @@ object Extras {
GradleUtils.load("$projectDir/../../gradle.properties", Extras)
GradleUtils.defaults()
GradleUtils.compileConfiguration(JavaVersion.VERSION_1_8)
GradleUtils.debug()
licensing {
license(License.APACHE_2) {
description(Extras.description)
author(Extras.vendor)
url(Extras.url)
}
}
//licensing {
// license(License.APACHE_2) {
// description(Extras.description)
// author(Extras.vendor)
// url(Extras.url)
// }
//}
repositories {
gradlePluginPortal()
@ -72,7 +71,7 @@ dependencies {
// the kotlin version is taken from the plugin, so it is not necessary to set it here
compileOnly("org.jetbrains.kotlin:kotlin-gradle-plugin")
implementation("com.dorkbox:Version:2.4")
implementation("com.dorkbox:Version:3.0")
}
tasks.jar.get().apply {
@ -94,6 +93,9 @@ tasks.jar.get().apply {
//////// Plugin Publishing + Release
/////////////////////////////////
gradlePlugin {
website.set(Extras.url)
vcsUrl.set(Extras.url)
plugins {
create("Licensing") {
id = "${Extras.group}.${Extras.id}"
@ -101,12 +103,7 @@ gradlePlugin {
displayName = Extras.name
description = Extras.description
version = Extras.version
tags.set(listOf("licensing", "legal", "notice", "license", "dependencies"))
}
}
}
pluginBundle {
website = Extras.url
vcsUrl = Extras.url
tags = listOf("licensing", "legal", "notice", "license", "dependencies")
}

12
src/dorkbox/license/AppLicensing.kt
View File

@ -17,7 +17,7 @@
package dorkbox.license
import License
import com.dorkbox.version.Version
import dorkbox.version.Version
import org.gradle.api.IllegalDependencyNotation
/**
@ -970,7 +970,7 @@ object AppLicensing {
"Example notations: 'com.dorkbox:Version:1.0', 'org.mockito:mockito-core:1.9.5:javadoc'")
}
1 -> {
Pair(split[0], Version.from(0))
Pair(split[0], Version(0))
}
2 -> {
val group = split[0]
@ -978,9 +978,9 @@ object AppLicensing {
// check to see if the name is really a version or a name
try {
Pair(group, Version.from(name))
Pair(group, Version(name))
} catch (e: Exception) {
Pair("$group:$name", Version.from(0))
Pair("$group:$name", Version(0))
}
}
else -> {
@ -990,9 +990,9 @@ object AppLicensing {
// check to see if the name is really a version or a name
try {
Pair("$group:$name", Version.from(ver))
Pair("$group:$name", Version(ver))
} catch (e: Exception) {
Pair("$group:$name", Version.from(0))
Pair("$group:$name", Version(0))
}
}
}