Release version 1.5.10

bytedeco · Jan 29, 2024 · e4de660 · e4de660
1 parent 4ddf762
commit e4de660
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+### January 29, 2024 version 1.5.10
  * Fix compatibility with Gradle 8.x ([pull #31](https://github.com/bytedeco/gradle-javacpp/issues/31))
 
 ### June 6, 2023 version 1.5.9

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = 'org.bytedeco'
-version = '1.5.10-SNAPSHOT'
+version = '1.5.10'
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

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.9")
+    id("org.bytedeco.gradle-javacpp-platform").version("1.5.10")
 }
 
 repositories {
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
     implementation(kotlin("stdlib-jdk8"))
-    implementation("org.bytedeco:javacv-platform:1.5.9")
+    implementation("org.bytedeco:javacv-platform:1.5.10")
 }
 
 tasks {

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.9'
+    id 'org.bytedeco.gradle-javacpp-platform' version '1.5.10'
 }
 
 group = 'org.bytedeco'
-version = '1.5.9'
+version = '1.5.10'
 
 repositories {
     mavenLocal()
@@ -13,7 +13,7 @@ repositories {
 }
 
 dependencies {
-    api "org.bytedeco:javacv-platform:1.5.9"
+    api "org.bytedeco:javacv-platform:1.5.10"
 //    api "org.bytedeco:opencv-platform-gpu:4.7.0-$version"
 //    api "org.bytedeco:ffmpeg-platform-gpl:6.0-$version"
     testImplementation 'junit:junit:4.13.2'

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.9' }
+gradle.rootProject { ext.javacppVersion = '1.5.10' }
diff --git a/samples/zlib/build.gradle b/samples/zlib/build.gradle
@@ -1,12 +1,12 @@
 plugins {
     id 'java-library'
-    id 'org.bytedeco.gradle-javacpp-build' version '1.5.9'
+    id 'org.bytedeco.gradle-javacpp-build' version '1.5.10'
     id 'maven-publish'
     id 'signing'
 }
 
 group = 'org.bytedeco'
-version = "1.3-$javacppVersion"
+version = "1.3.1-$javacppVersion"
 
 repositories {
     mavenLocal()
@@ -71,25 +71,9 @@ javadoc {
     options.links = ['http://bytedeco.org/javacpp/apidocs']
 }
 
-//doesn't work with Gradle 5.x
-//java {
-//    withJavadocJar()
-//    withSourcesJar()
-//}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-artifacts {
-    archives javadocJar
-    archives sourcesJar
+java {
+    withJavadocJar()
+    withSourcesJar()
 }
 
 def pomClosure = {

diff --git a/samples/zlib/build.sh b/samples/zlib/build.sh
@@ -4,11 +4,11 @@ set -e
 mkdir -p build/$PLATFORM
 cd build/$PLATFORM
 
-ZLIB_VERSION=1.3
+ZLIB_VERSION=1.3.1
 if [[ ! -e "zlib-$ZLIB_VERSION.tar.gz" ]]; then
     curl -L "http://zlib.net/zlib-$ZLIB_VERSION.tar.gz" -o "zlib-$ZLIB_VERSION.tar.gz"
 fi
-echo "ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e  zlib-$ZLIB_VERSION.tar.gz" | shasum -a 256 -c -
+echo "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23  zlib-$ZLIB_VERSION.tar.gz" | shasum -a 256 -c -
 
 echo "Decompressing archives..."
 tar --totals -xf "zlib-$ZLIB_VERSION.tar.gz"

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.9' }
+gradle.rootProject { ext.javacppVersion = '1.5.10' }