Release version 1.5.4

bytedeco · Sep 10, 2020 · e1e6e3b · e1e6e3b
1 parent 23c8c0e
commit e1e6e3b
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1,3 @@
 
-Initial release
+### September 9, 2020 version 1.5.4
+ * Initial release
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = 'org.bytedeco'
-version = '1.5.4-SNAPSHOT'
+version = '1.5.4'
 
 repositories {
     mavenLocal()
@@ -20,6 +20,8 @@ dependencies {
 }
 
 gradlePlugin {
+    // need to sign before publishing
+    automatedPublishing = false
     plugins {
         build {
             id = 'org.bytedeco.gradle-javacpp-build'
@@ -52,6 +54,7 @@ javadoc {
                      'http://junit.org/junit4/javadoc/4.12']
 }
 
+//doesn't work with Gradle 5.x
 //java {
 //    withJavadocJar()
 //    withSourcesJar()
@@ -72,45 +75,72 @@ artifacts {
     archives sourcesJar
 }
 
+def pomClosure = {
+    name = 'Gradle JavaCPP'
+    delegate.description = 'Gradle plugins to automate the build process of JavaCPP and JavaCV'
+    url = 'http://bytedeco.org/gradle-javacpp/'
+    licenses {
+        license {
+            name = 'Apache License, Version 2.0'
+            url = 'http://www.apache.org/licenses/LICENSE-2.0'
+            distribution = 'repo'
+        }
+        license {
+            name = 'GNU General Public License (GPL) version 2, or any later version'
+            url = 'http://www.gnu.org/licenses/'
+            distribution = 'repo'
+        }
+        license {
+            name = 'GPLv2 with Classpath exception'
+            url = 'http://www.gnu.org/software/classpath/license.html'
+            distribution = 'repo'
+        }
+    }
+    developers {
+        developer {
+            id = 'saudet'
+            name = 'Samuel Audet'
+            email = '[email protected]'
+        }
+    }
+    scm {
+        url = 'https://github.com/bytedeco/gradle-javacpp'
+        connection = 'scm:git:git://github.com/bytedeco/gradle-javacpp.git'
+        developerConnection = 'scm:git:ssh://[email protected]/bytedeco/gradle-javacpp.git'
+    }
+}
+
 publishing {
     publications {
         mavenJava(MavenPublication) {
             from components.java
             artifact javadocJar
             artifact sourcesJar
-            pom {
-                name = 'Gradle JavaCPP'
-                description = 'Gradle plugins to automate the build process of JavaCPP and JavaCV'
-                url = 'http://bytedeco.org/gradle-javacpp/'
-                licenses {
-                    license {
-                        name = 'Apache License, Version 2.0'
-                        url = 'http://www.apache.org/licenses/LICENSE-2.0'
-                        distribution = 'repo'
-                    }
-                    license {
-                        name = 'GNU General Public License (GPL) version 2, or any later version'
-                        url = 'http://www.gnu.org/licenses/'
-                        distribution = 'repo'
-                    }
-                    license {
-                        name = 'GPLv2 with Classpath exception'
-                        url = 'http://www.gnu.org/software/classpath/license.html'
-                        distribution = 'repo'
-                    }
-                }
-                developers {
-                    developer {
-                        id = 'saudet'
-                        name = 'Samuel Audet'
-                        email = '[email protected]'
-                    }
-                }
-                scm {
-                    url = 'https://github.com/bytedeco/gradle-javacpp'
-                    connection = 'scm:git:git://github.com/bytedeco/gradle-javacpp.git'
-                    developerConnection = 'scm:git:ssh://[email protected]/bytedeco/gradle-javacpp.git'
-                }
+            pomClosure.delegate = getPom()
+            pomClosure()
+        }
+        buildPluginMarkerMaven(MavenPublication) {
+            groupId gradlePlugin.plugins.build.id
+            artifactId gradlePlugin.plugins.build.id + ".gradle.plugin"
+            pomClosure.delegate = getPom()
+            pomClosure()
+            pom.withXml {
+                def dependency = asNode().appendNode('dependencies').appendNode('dependency')
+                dependency.appendNode('groupId', group)
+                dependency.appendNode('artifactId', rootProject.name)
+                dependency.appendNode('version', version)
+            }
+        }
+        platformPluginMarkerMaven(MavenPublication) {
+            groupId gradlePlugin.plugins.platform.id
+            artifactId gradlePlugin.plugins.platform.id + ".gradle.plugin"
+            pomClosure.delegate = getPom()
+            pomClosure()
+            pom.withXml {
+                def dependency = asNode().appendNode('dependencies').appendNode('dependency')
+                dependency.appendNode('groupId', group)
+                dependency.appendNode('artifactId', rootProject.name)
+                dependency.appendNode('version', version)
             }
         }
     }
@@ -128,6 +158,11 @@ publishing {
 }
 
 signing {
-    if (!version.endsWith('SNAPSHOT')) sign publishing.publications.mavenJava
+    useGpgCmd()
+    if (!version.endsWith('SNAPSHOT')) {
+        sign publishing.publications.mavenJava
+        sign publishing.publications.buildPluginMarkerMaven
+        sign publishing.publications.platformPluginMarkerMaven
+    }
 }
 
diff --git a/samples/javacv-demo-kotlin/build.gradle.kts b/samples/javacv-demo-kotlin/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     kotlin("jvm").version("1.3.72")
     // Apply the java-library plugin for API and implementation separation.
     `java-library`
-    id("org.bytedeco.gradle-javacpp-platform").version("1.5.4-SNAPSHOT")
+    id("org.bytedeco.gradle-javacpp-platform").version("1.5.4")
 }
 
 repositories {
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
     implementation(kotlin("stdlib-jdk8"))
-    implementation("org.bytedeco:javacv-platform:1.5.4-SNAPSHOT")
+    implementation("org.bytedeco:javacv-platform:1.5.4")
 }
 
 tasks {
@@ -34,4 +34,4 @@ tasks {
             configurations.runtimeClasspath.get().filter { it.name.endsWith("jar") }.map { zipTree(it) }
         })
     }
-}
+}
diff --git a/samples/javacv-demo/build.gradle b/samples/javacv-demo/build.gradle
@@ -1,10 +1,10 @@
 plugins {
     id 'java-library'
-    id 'org.bytedeco.gradle-javacpp-platform' version '1.5.4-SNAPSHOT'
+    id 'org.bytedeco.gradle-javacpp-platform' version '1.5.4'
 }
 
 group = 'org.bytedeco'
-version = '1.5.4-SNAPSHOT'
+version = '1.5.4'
 
 repositories {
     mavenLocal()
@@ -14,6 +14,7 @@ repositories {
 
 dependencies {
     api "org.bytedeco:javacv-platform:$version"
+//    api "org.bytedeco:opencv-platform-gpu:4.4.0-$version"
     testImplementation 'junit:junit:4.12'
 }
 

diff --git a/samples/javacv-demo/settings.gradle b/samples/javacv-demo/settings.gradle
@@ -9,4 +9,4 @@ pluginManagement {
 
 rootProject.name = 'javacv-demo'
 
-gradle.rootProject { ext.javacppVersion = '1.5.4-SNAPSHOT' }
+gradle.rootProject { ext.javacppVersion = '1.5.4' }
diff --git a/samples/zlib/build.gradle b/samples/zlib/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java-library'
-    id 'org.bytedeco.gradle-javacpp-build' version '1.5.4-SNAPSHOT'
+    id 'org.bytedeco.gradle-javacpp-build' version '1.5.4'
 }
 
 group = 'org.bytedeco'

diff --git a/samples/zlib/settings.gradle b/samples/zlib/settings.gradle
@@ -9,4 +9,4 @@ pluginManagement {
 
 rootProject.name = 'zlib'
 
-gradle.rootProject { ext.javacppVersion = '1.5.4-SNAPSHOT' }
+gradle.rootProject { ext.javacppVersion = '1.5.4' }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,4 @@ pluginManagement {

		rootProject.name = 'javacv-demo'

		gradle.rootProject { ext.javacppVersion = '1.5.4-SNAPSHOT' }
		gradle.rootProject { ext.javacppVersion = '1.5.4' }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,4 @@ pluginManagement {

		rootProject.name = 'zlib'

		gradle.rootProject { ext.javacppVersion = '1.5.4-SNAPSHOT' }
		gradle.rootProject { ext.javacppVersion = '1.5.4' }