diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3f1b1f9..f611abb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -97,7 +97,7 @@ jobs: path: gradleDir/outputs/ build-mac: - name: "Build - macOS" + name: "Build - macOS (Arm)" runs-on: macOS-14 steps: - uses: actions/checkout@v4 @@ -111,11 +111,11 @@ jobs: name: Build with Gradle - uses: actions/upload-artifact@v4 with: - name: macOS + name: macOSArm path: gradleDir/outputs/ build-mac-arm: - name: "Build - macOS (Arm)" + name: "Build - macOS" runs-on: macOS-14 steps: - uses: actions/checkout@v4 @@ -129,7 +129,7 @@ jobs: name: Build with Gradle - uses: actions/upload-artifact@v4 with: - name: macOSArm + name: macOS path: gradleDir/outputs/ make_universal: diff --git a/build.gradle b/build.gradle index 227d75c..e14e180 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,8 @@ apply plugin: 'java' def date = new Date() def formattedDate = date.format('yyMMdd') -ext.version = "4.8.0" -ext.soVersion = "4.8" +ext.version = "4.10.0" +ext.soVersion = "4.10" ext.libVersion = "${ext.version.replace(".", "")}" ext.licenseFile = file("$rootDir/opencv/LICENSE") diff --git a/opencv b/opencv index eaf8d6c..526e0d2 160000 --- a/opencv +++ b/opencv @@ -1 +1 @@ -Subproject commit eaf8d6c04b1819598169e36dc1b026cd5ebf1cb1 +Subproject commit 526e0d27601ccbbabe7c97c764cbeb0ae24df807 diff --git a/opencv_contrib b/opencv_contrib index f10c84d..1ed3dd2 160000 --- a/opencv_contrib +++ b/opencv_contrib @@ -1 +1 @@ -Subproject commit f10c84d48b0714f2b408c9e5cccfac1277c8e6cc +Subproject commit 1ed3dd2c53888e3289afdb22ec4e9ebbff3dba87 diff --git a/publish.gradle b/publish.gradle index ecae255..a01cd16 100644 --- a/publish.gradle +++ b/publish.gradle @@ -13,7 +13,7 @@ publishing { } } -def pubVersion = "${project.ext.version}-2" +def pubVersion = "${project.ext.version}-1" def outputsFolder = file("$project.buildDir/outputs")