From 86f107dafca77537c152c3652a1c0002acdaa1bf Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Sun, 27 May 2018 23:43:35 -0400
Subject: [PATCH] Fix inter-project dependency and including libs into
 algorithm jar.

---
 build.gradle | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 324332c..ccceef1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,14 +8,14 @@ plugins {
 
 description = 'Master Password Algorithm Implementation'
 
-task archive( type: Zip ) {
-    dependsOn assemble
-
-    components.withType( ComponentWithRuntimeFile ) {
-        if (isOptimized()) {
-            from getRuntimeFile()
-            into standardOperatingSystem( linkTask.get().targetPlatform.get() ) + '/' +
-                 standardArchitecture( linkTask.get().targetPlatform.get() )
+artifacts {
+    'default' task( type: Zip, "archive" ) {
+        components.withType( ComponentWithRuntimeFile ) {
+            if (isOptimized()) {
+                from getRuntimeFile()
+                into standardOperatingSystem( linkTask.get().targetPlatform.get() ) + '/' +
+                     standardArchitecture( linkTask.get().targetPlatform.get() )
+            }
         }
     }
 }
@@ -34,7 +34,6 @@ library {
         }
     }
     components.withType( CppComponent ) {
-        // Reconfigure the toolchain from C++ to C.
         cppSource.from fileTree( dir: "src", include: "**/*.c" )
     }
 
@@ -43,6 +42,7 @@ library {
                            objects.named( OperatingSystemFamily, OperatingSystemFamily.LINUX ),
                            objects.named( OperatingSystemFamily, OperatingSystemFamily.MAC_OS )] )
 
+    //
     binaries.configureEach {
         // Resolve a standard name for the platform.
         def platform = standardOperatingSystem( targetPlatform )