* Fix compatibility with Gradle 7.x (issue #17)

bytedeco · Jun 28, 2021 · dbcacfa · dbcacfa
1 parent c63d8a4
commit dbcacfa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Fix compatibility with Gradle 7.x ([issue #17](https://github.com/bytedeco/gradle-javacpp/issues/17))
  * Make `BuildTask` properties `public` to allow access with Kotlin DSL ([pull #16](https://github.com/bytedeco/gradle-javacpp/issues/16))
  * Fix `BuildPlugin` incorrectly resetting `javacppBuildParser.outputDirectory` in subprojects ([pull #12](https://github.com/bytedeco/gradle-javacpp/issues/12))
 

diff --git a/build.gradle b/build.gradle
@@ -38,10 +38,10 @@ jar {
     manifest {
         attributes 'Implementation-Title': 'Gradle JavaCPP',
                    'Implementation-Vendor': 'Bytedeco',
-                   'Implementation-Version': version,
+                   'Implementation-Version': project.version,
                    'Specification-Title': 'Gradle JavaCPP',
                    'Specification-Vendor': 'Bytedeco',
-                   'Specification-Version': version
+                   'Specification-Version': project.version
     }
 }
 

diff --git a/samples/zlib/build.gradle b/samples/zlib/build.gradle
@@ -59,10 +59,10 @@ jar {
         attributes 'Class-Path': configurations.runtimeClasspath.collect { it.getName() }.join(' '),
                    'Implementation-Title': 'JavaCPP Presets for zlib',
                    'Implementation-Vendor': 'Bytedeco',
-                   'Implementation-Version': version,
+                   'Implementation-Version': project.version,
                    'Specification-Title': 'JavaCPP Presets for zlib',
                    'Specification-Vendor': 'Bytedeco',
-                   'Specification-Version': version
+                   'Specification-Version': project.version
     }
 }
 

diff --git a/src/main/java/org/bytedeco/gradle/javacpp/BuildExtension.java b/src/main/java/org/bytedeco/gradle/javacpp/BuildExtension.java
@@ -72,7 +72,7 @@ public BuildExtension(BuildPlugin plugin) {
     public List<MavenArtifact> existingArtifacts(Configuration configuration) throws IOException {
         ArrayList<MavenArtifact> artifacts = new ArrayList<MavenArtifact>();
         BasePluginConvention bc = project.getConvention().getPlugin(BasePluginConvention.class);
-        File libsDir = bc.getLibsDir();
+        File libsDir = new File(project.getBuildDir(), bc.getLibsDirName());
         libsDir.mkdirs();
         try {
             // Temporarily rename our project to prevent Gradle from resolving the artifacts to project dependencies without files.