* Fix compatibility with Gradle 7.6.x (issue #28)

bytedeco · Dec 21, 2022 · 9098dcd · 9098dcd
1 parent d7d57e8
commit 9098dcd
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 21 deletions.
diff --git a/.github/workflows/gradle-javacpp.yml b/.github/workflows/gradle-javacpp.yml
@@ -10,7 +10,7 @@ env:
   STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
 jobs:
   linux-x86_64:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     container: centos:7
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
 
+ * Fix compatibility with Gradle 7.6.x ([issue #28](https://github.com/bytedeco/gradle-javacpp/issues/28))
+
 ### November 2, 2022 version 1.5.8
  * Remove lambda expressions since Gradle dislikes them ([issue #23](https://github.com/bytedeco/gradle-javacpp/issues/23))
  * Update instructions to integrate `BuildTask` with Android Studio ([issue #22](https://github.com/bytedeco/gradle-javacpp/issues/22))

diff --git a/src/main/java/org/bytedeco/gradle/javacpp/PlatformRule.java b/src/main/java/org/bytedeco/gradle/javacpp/PlatformRule.java
@@ -70,31 +70,34 @@ class PlatformRule implements ComponentMetadataRule {
                 while (i.hasNext()) {
                     DirectDependencyMetadata d = i.next();
                     String classifier = null;
-// This only works starting with Gradle 6.3:
-//                    List<DependencyArtifact> as = d.getArtifactSelectors();
-//                    if (as != null && as.size() > 0) {
-//                        classifier = as.get(0).getClassifier();
-//                    }
-// So try to get the classifier some other way...
                     try {
-                        if (d instanceof AbstractDependencyMetadataAdapter) {
-                            Method getMetadata = AbstractDependencyMetadataAdapter.class.getDeclaredMethod("getOriginalMetadata");
-                            getMetadata.setAccessible(true);
-                            Object o = getMetadata.invoke(d);
-                            if (o instanceof ConfigurationBoundExternalDependencyMetadata) {
-                                ConfigurationBoundExternalDependencyMetadata m = (ConfigurationBoundExternalDependencyMetadata)o;
-                                ExternalDependencyDescriptor dd = m.getDependencyDescriptor();
-                                if (dd instanceof MavenDependencyDescriptor) {
-                                    MavenDependencyDescriptor mdd = (MavenDependencyDescriptor)dd;
-                                    IvyArtifactName da = mdd.getDependencyArtifact();
-                                    if (da != null) {
-                                        classifier = da.getClassifier();
+                        // This only works starting with Gradle 6.3:
+                        List<org.gradle.api.artifacts.DependencyArtifact> as = d.getArtifactSelectors();
+                        if (as != null && as.size() > 0) {
+                            classifier = as.get(0).getClassifier();
+                        }
+                    } catch (NoSuchMethodError ex) {
+                        // So try to get the classifier some other way...
+                        try {
+                            if (d instanceof AbstractDependencyMetadataAdapter) {
+                                Method getMetadata = AbstractDependencyMetadataAdapter.class.getDeclaredMethod("getOriginalMetadata");
+                                getMetadata.setAccessible(true);
+                                Object o = getMetadata.invoke(d);
+                                if (o instanceof ConfigurationBoundExternalDependencyMetadata) {
+                                    ConfigurationBoundExternalDependencyMetadata m = (ConfigurationBoundExternalDependencyMetadata)o;
+                                    ExternalDependencyDescriptor dd = m.getDependencyDescriptor();
+                                    if (dd instanceof MavenDependencyDescriptor) {
+                                        MavenDependencyDescriptor mdd = (MavenDependencyDescriptor)dd;
+                                        IvyArtifactName da = mdd.getDependencyArtifact();
+                                        if (da != null) {
+                                            classifier = da.getClassifier();
+                                        }
                                     }
                                 }
                             }
+                        } catch (ReflectiveOperationException e) {
+                            logger.warn("Could not get the classifier of " + d + ": " + e);
                         }
-                    } catch (ReflectiveOperationException e) {
-                        logger.warn("Could not get the classifier of " + d + ": " + e);
                     }
                     final String c = classifier;
                     if (classifier != null && platform.stream()