Release version 1.5.8

bytedeco · Nov 3, 2022 · 566f2ec · 566f2ec
1 parent dc71a38
commit 566f2ec
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+### November 2, 2022 version 1.5.8
  * Remove lambda expressions since Gradle dislikes them ([issue #23](https://github.com/bytedeco/gradle-javacpp/issues/23))
  * Update instructions to integrate `BuildTask` with Android Studio ([issue #22](https://github.com/bytedeco/gradle-javacpp/issues/22))
 

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,10 @@ plugins {
 }
 
 group = 'org.bytedeco'
-version = '1.5.8-SNAPSHOT'
+version = '1.5.8'
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
 
 repositories {
     mavenLocal()
@@ -19,11 +22,6 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
 }
 
-java {
-    sourceCompatibility = 1.7
-    targetCompatibility = 1.7
-}
-
 gradlePlugin {
     // need to sign before publishing
     automatedPublishing = false

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.7")
+    id("org.bytedeco.gradle-javacpp-platform").version("1.5.8")
 }
 
 repositories {
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
     implementation(kotlin("stdlib-jdk8"))
-    implementation("org.bytedeco:javacv-platform:1.5.7")
+    implementation("org.bytedeco:javacv-platform:1.5.8")
 }
 
 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.7'
+    id 'org.bytedeco.gradle-javacpp-platform' version '1.5.8'
 }
 
 group = 'org.bytedeco'
-version = '1.5.7'
+version = '1.5.8'
 
 repositories {
     mavenLocal()
@@ -13,9 +13,9 @@ repositories {
 }
 
 dependencies {
-    api "org.bytedeco:javacv-platform:1.5.7"
-//    api "org.bytedeco:opencv-platform-gpu:4.5.5-$version"
-//    api "org.bytedeco:ffmpeg-platform-gpl:5.0-$version"
+    api "org.bytedeco:javacv-platform:1.5.8"
+//    api "org.bytedeco:opencv-platform-gpu:4.6.0-$version"
+//    api "org.bytedeco:ffmpeg-platform-gpl:5.1.2-$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.7' }
+gradle.rootProject { ext.javacppVersion = '1.5.8' }
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.7'
+    id 'org.bytedeco.gradle-javacpp-build' version '1.5.8'
     id 'maven-publish'
     id 'signing'
 }
 
 group = 'org.bytedeco'
-version = "1.2.11-$javacppVersion"
+version = "1.2.13-$javacppVersion"
 
 repositories {
     mavenLocal()

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.2.11
+ZLIB_VERSION=1.2.13
 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 "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1  zlib-$ZLIB_VERSION.tar.gz" | shasum -a 256 -c -
+echo "b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30  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.7' }
+gradle.rootProject { ext.javacppVersion = '1.5.8' }