Skip to content

Commit e4de660

Browse files
committed
Release version 1.5.10
1 parent 4ddf762 commit e4de660

File tree

8 files changed

+16
-31
lines changed

8 files changed

+16
-31
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
### January 29, 2024 version 1.5.10
23
* Fix compatibility with Gradle 8.x ([pull #31](https://github.com/bytedeco/gradle-javacpp/issues/31))
34

45
### June 6, 2023 version 1.5.9

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
group = 'org.bytedeco'
9-
version = '1.5.10-SNAPSHOT'
9+
version = '1.5.10'
1010

1111
sourceCompatibility = 1.7
1212
targetCompatibility = 1.7

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

+2-2
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.9")
6+
id("org.bytedeco.gradle-javacpp-platform").version("1.5.10")
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.9")
18+
implementation("org.bytedeco:javacv-platform:1.5.10")
1919
}
2020

2121
tasks {

samples/javacv-demo/build.gradle

+3-3
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.9'
3+
id 'org.bytedeco.gradle-javacpp-platform' version '1.5.10'
44
}
55

66
group = 'org.bytedeco'
7-
version = '1.5.9'
7+
version = '1.5.10'
88

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

1515
dependencies {
16-
api "org.bytedeco:javacv-platform:1.5.9"
16+
api "org.bytedeco:javacv-platform:1.5.10"
1717
// api "org.bytedeco:opencv-platform-gpu:4.7.0-$version"
1818
// api "org.bytedeco:ffmpeg-platform-gpl:6.0-$version"
1919
testImplementation 'junit:junit:4.13.2'

samples/javacv-demo/settings.gradle

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

samples/zlib/build.gradle

+5-21
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.9'
3+
id 'org.bytedeco.gradle-javacpp-build' version '1.5.10'
44
id 'maven-publish'
55
id 'signing'
66
}
77

88
group = 'org.bytedeco'
9-
version = "1.3-$javacppVersion"
9+
version = "1.3.1-$javacppVersion"
1010

1111
repositories {
1212
mavenLocal()
@@ -71,25 +71,9 @@ javadoc {
7171
options.links = ['http://bytedeco.org/javacpp/apidocs']
7272
}
7373

74-
//doesn't work with Gradle 5.x
75-
//java {
76-
// withJavadocJar()
77-
// withSourcesJar()
78-
//}
79-
80-
task javadocJar(type: Jar, dependsOn: javadoc) {
81-
classifier = 'javadoc'
82-
from javadoc.destinationDir
83-
}
84-
85-
task sourcesJar(type: Jar, dependsOn: classes) {
86-
classifier = 'sources'
87-
from sourceSets.main.allSource
88-
}
89-
90-
artifacts {
91-
archives javadocJar
92-
archives sourcesJar
74+
java {
75+
withJavadocJar()
76+
withSourcesJar()
9377
}
9478

9579
def pomClosure = {

samples/zlib/build.sh

+2-2
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.3
7+
ZLIB_VERSION=1.3.1
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 "ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e zlib-$ZLIB_VERSION.tar.gz" | shasum -a 256 -c -
11+
echo "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23 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

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

0 commit comments

Comments
 (0)