Update to OpenCV 4.10.0 (#91)

Flip the CI names of Mac; MacOS 14 runners are ARM
wpilibsuite · Dec 6, 2024 · 998103a · 998103a
1 parent ad856d7
commit 998103a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
diff --git a/opencv_contrib b/opencv_contrib
diff --git 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")
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ publishing { @@
         }
     }
-    def pubVersion = "${project.ext.version}-2"
+    def pubVersion = "${project.ext.version}-1"
     def outputsFolder = file("$project.buildDir/outputs")
@@ Expand Down @@