Commit e4de660 1 parent 4ddf762 commit e4de660 Copy full SHA for e4de660
File tree 8 files changed +16
-31
lines changed
8 files changed +16
-31
lines changed Original file line number Diff line number Diff line change 1
1
2
+ ### January 29, 2024 version 1.5.10
2
3
* Fix compatibility with Gradle 8.x ([ pull #31 ] ( https://github.com/bytedeco/gradle-javacpp/issues/31 ) )
3
4
4
5
### June 6, 2023 version 1.5.9
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ plugins {
6
6
}
7
7
8
8
group = ' org.bytedeco'
9
- version = ' 1.5.10-SNAPSHOT '
9
+ version = ' 1.5.10'
10
10
11
11
sourceCompatibility = 1.7
12
12
targetCompatibility = 1.7
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ plugins {
3
3
kotlin(" jvm" ).version(" 1.3.72" )
4
4
// Apply the java-library plugin for API and implementation separation.
5
5
`java- library`
6
- id(" org.bytedeco.gradle-javacpp-platform" ).version(" 1.5.9 " )
6
+ id(" org.bytedeco.gradle-javacpp-platform" ).version(" 1.5.10 " )
7
7
}
8
8
9
9
repositories {
@@ -15,7 +15,7 @@ repositories {
15
15
16
16
dependencies {
17
17
implementation(kotlin(" stdlib-jdk8" ))
18
- implementation(" org.bytedeco:javacv-platform:1.5.9 " )
18
+ implementation(" org.bytedeco:javacv-platform:1.5.10 " )
19
19
}
20
20
21
21
tasks {
Original file line number Diff line number Diff line change 1
1
plugins {
2
2
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 '
4
4
}
5
5
6
6
group = ' org.bytedeco'
7
- version = ' 1.5.9 '
7
+ version = ' 1.5.10 '
8
8
9
9
repositories {
10
10
mavenLocal()
@@ -13,7 +13,7 @@ repositories {
13
13
}
14
14
15
15
dependencies {
16
- api " org.bytedeco:javacv-platform:1.5.9 "
16
+ api " org.bytedeco:javacv-platform:1.5.10 "
17
17
// api "org.bytedeco:opencv-platform-gpu:4.7.0-$version"
18
18
// api "org.bytedeco:ffmpeg-platform-gpl:6.0-$version"
19
19
testImplementation ' junit:junit:4.13.2'
Original file line number Diff line number Diff line change @@ -9,4 +9,4 @@ pluginManagement {
9
9
10
10
rootProject. name = ' javacv-demo'
11
11
12
- gradle. rootProject { ext. javacppVersion = ' 1.5.9 ' }
12
+ gradle. rootProject { ext. javacppVersion = ' 1.5.10 ' }
Original file line number Diff line number Diff line change 1
1
plugins {
2
2
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 '
4
4
id ' maven-publish'
5
5
id ' signing'
6
6
}
7
7
8
8
group = ' org.bytedeco'
9
- version = " 1.3-$javacppVersion "
9
+ version = " 1.3.1 -$javacppVersion "
10
10
11
11
repositories {
12
12
mavenLocal()
@@ -71,25 +71,9 @@ javadoc {
71
71
options. links = [' http://bytedeco.org/javacpp/apidocs' ]
72
72
}
73
73
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()
93
77
}
94
78
95
79
def pomClosure = {
Original file line number Diff line number Diff line change 4
4
mkdir -p build/$PLATFORM
5
5
cd build/$PLATFORM
6
6
7
- ZLIB_VERSION=1.3
7
+ ZLIB_VERSION=1.3.1
8
8
if [[ ! -e " zlib-$ZLIB_VERSION .tar.gz" ]]; then
9
9
curl -L " http://zlib.net/zlib-$ZLIB_VERSION .tar.gz" -o " zlib-$ZLIB_VERSION .tar.gz"
10
10
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 -
12
12
13
13
echo " Decompressing archives..."
14
14
tar --totals -xf " zlib-$ZLIB_VERSION .tar.gz"
Original file line number Diff line number Diff line change @@ -9,4 +9,4 @@ pluginManagement {
9
9
10
10
rootProject. name = ' zlib'
11
11
12
- gradle. rootProject { ext. javacppVersion = ' 1.5.9 ' }
12
+ gradle. rootProject { ext. javacppVersion = ' 1.5.10 ' }
You can’t perform that action at this time.
0 commit comments