Skip to content

Commit 566f2ec

Browse files
committed
Release version 1.5.8
1 parent dc71a38 commit 566f2ec

File tree

8 files changed

+18
-19
lines changed

8 files changed

+18
-19
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
### November 2, 2022 version 1.5.8
23
* Remove lambda expressions since Gradle dislikes them ([issue #23](https://github.com/bytedeco/gradle-javacpp/issues/23))
34
* Update instructions to integrate `BuildTask` with Android Studio ([issue #22](https://github.com/bytedeco/gradle-javacpp/issues/22))
45

build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ plugins {
66
}
77

88
group = 'org.bytedeco'
9-
version = '1.5.8-SNAPSHOT'
9+
version = '1.5.8'
10+
11+
sourceCompatibility = 1.7
12+
targetCompatibility = 1.7
1013

1114
repositories {
1215
mavenLocal()
@@ -19,11 +22,6 @@ dependencies {
1922
testImplementation 'junit:junit:4.13.2'
2023
}
2124

22-
java {
23-
sourceCompatibility = 1.7
24-
targetCompatibility = 1.7
25-
}
26-
2725
gradlePlugin {
2826
// need to sign before publishing
2927
automatedPublishing = false

samples/javacv-demo-kotlin/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
kotlin("jvm").version("1.3.72")
44
// Apply the java-library plugin for API and implementation separation.
55
`java-library`
6-
id("org.bytedeco.gradle-javacpp-platform").version("1.5.7")
6+
id("org.bytedeco.gradle-javacpp-platform").version("1.5.8")
77
}
88

99
repositories {
@@ -15,7 +15,7 @@ repositories {
1515

1616
dependencies {
1717
implementation(kotlin("stdlib-jdk8"))
18-
implementation("org.bytedeco:javacv-platform:1.5.7")
18+
implementation("org.bytedeco:javacv-platform:1.5.8")
1919
}
2020

2121
tasks {

samples/javacv-demo/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
plugins {
22
id 'java-library'
3-
id 'org.bytedeco.gradle-javacpp-platform' version '1.5.7'
3+
id 'org.bytedeco.gradle-javacpp-platform' version '1.5.8'
44
}
55

66
group = 'org.bytedeco'
7-
version = '1.5.7'
7+
version = '1.5.8'
88

99
repositories {
1010
mavenLocal()
@@ -13,9 +13,9 @@ repositories {
1313
}
1414

1515
dependencies {
16-
api "org.bytedeco:javacv-platform:1.5.7"
17-
// api "org.bytedeco:opencv-platform-gpu:4.5.5-$version"
18-
// api "org.bytedeco:ffmpeg-platform-gpl:5.0-$version"
16+
api "org.bytedeco:javacv-platform:1.5.8"
17+
// api "org.bytedeco:opencv-platform-gpu:4.6.0-$version"
18+
// api "org.bytedeco:ffmpeg-platform-gpl:5.1.2-$version"
1919
testImplementation 'junit:junit:4.13.2'
2020
}
2121

samples/javacv-demo/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ pluginManagement {
99

1010
rootProject.name = 'javacv-demo'
1111

12-
gradle.rootProject { ext.javacppVersion = '1.5.7' }
12+
gradle.rootProject { ext.javacppVersion = '1.5.8' }

samples/zlib/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
plugins {
22
id 'java-library'
3-
id 'org.bytedeco.gradle-javacpp-build' version '1.5.7'
3+
id 'org.bytedeco.gradle-javacpp-build' version '1.5.8'
44
id 'maven-publish'
55
id 'signing'
66
}
77

88
group = 'org.bytedeco'
9-
version = "1.2.11-$javacppVersion"
9+
version = "1.2.13-$javacppVersion"
1010

1111
repositories {
1212
mavenLocal()

samples/zlib/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ set -e
44
mkdir -p build/$PLATFORM
55
cd build/$PLATFORM
66

7-
ZLIB_VERSION=1.2.11
7+
ZLIB_VERSION=1.2.13
88
if [[ ! -e "zlib-$ZLIB_VERSION.tar.gz" ]]; then
99
curl -L "http://zlib.net/zlib-$ZLIB_VERSION.tar.gz" -o "zlib-$ZLIB_VERSION.tar.gz"
1010
fi
11-
echo "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 zlib-$ZLIB_VERSION.tar.gz" | shasum -a 256 -c -
11+
echo "b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30 zlib-$ZLIB_VERSION.tar.gz" | shasum -a 256 -c -
1212

1313
echo "Decompressing archives..."
1414
tar --totals -xf "zlib-$ZLIB_VERSION.tar.gz"

samples/zlib/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ pluginManagement {
99

1010
rootProject.name = 'zlib'
1111

12-
gradle.rootProject { ext.javacppVersion = '1.5.7' }
12+
gradle.rootProject { ext.javacppVersion = '1.5.8' }

0 commit comments

Comments
 (0)