From b1353e4d6ebc532a85400f36b52c68c72855d5de Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Tue, 30 Jun 2020 22:50:02 -0700
Subject: [PATCH] [cscore] Fix jnicvstatic classifier (#2561)

The archive needed to be zip, additionally the library needed to statically link to cscore. All better now
---
 cscore/build.gradle       | 2 +-
 shared/jni/publish.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cscore/build.gradle b/cscore/build.gradle
index 0981b1e8a9..383fe68be2 100644
--- a/cscore/build.gradle
+++ b/cscore/build.gradle
@@ -44,7 +44,7 @@ model {
                     it.buildable = false
                     return
                 }
-                lib library: "${nativeName}", linkage: 'shared'
+                lib library: "${nativeName}", linkage: 'static'
                 lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
             }
         }
diff --git a/shared/jni/publish.gradle b/shared/jni/publish.gradle
index 3154ea0fff..d73f88c386 100644
--- a/shared/jni/publish.gradle
+++ b/shared/jni/publish.gradle
@@ -113,7 +113,7 @@ model {
         }
 
         if (project.hasProperty('cvStaticBuild') && project.getProperty('cvStaticBuild') == true) {
-            def jniCvTaskList = createComponentZipTasks($.components, ["${nativeName}JNICvStatic"], jniCvStaticBaseName, Jar, project, { task, value ->
+            def jniCvTaskList = createComponentZipTasks($.components, ["${nativeName}JNICvStatic"], jniCvStaticBaseName, Zip, project, { task, value ->
                 value.each { binary ->
                     if (binary.buildable) {
                         if (binary instanceof SharedLibraryBinarySpec) {