Use published artifact for remoteapi jar file and update to non-deprecated property names

SVN r65370 |2020-04-17 13:40:09 +0000

Author: labkey-susanh

sas/build.gradle

@@ -8,17 +8,24 @@ TeamCityExtension teamCityExt  = project.getExtensions().findByType(TeamCityExte
 if (TeamCityExtension.isOnTeamCity(project) && teamCityExt == null)
     project.extensions.create("teamCity", TeamCityExtension, project)
 
+configurations {
+    remoteApi
+}
+
+dependencies {
+    BuildUtils.addLabKeyDependency(project: project, config: "remoteApi", depProjectPath: BuildUtils.getRemoteApiProjectPath(gradle), depVersion: project.labkeyClientApiVersion)
+}
+
 
 project.task("distribution",
         group: GroupNames.DISTRIBUTION,
         description: "Create a zip file for the SAS API client distribution containing the SAS macros, java client api jar and its dependencies",
         type: Zip,
         {Zip zip ->
-            zip.baseName = "LabKey${BuildUtils.getDistributionVersion(project)}-ClientAPI-SAS"
+            zip.archiveBaseName.set("LabKey${BuildUtils.getDistributionVersion(project)}-ClientAPI-SAS")
             zip.from (project.file("macros"))
-            zip.from (project.project(BuildUtils.getRemoteApiProjectPath(gradle)).tasks.jar)
-            zip.from (project.project(BuildUtils.getRemoteApiProjectPath(gradle)).configurations.compile)
-            zip.into zip.baseName
-            zip.destinationDir project.rootProject.file("dist/client-api/sas")
+            zip.from project.configurations.remoteApi
+            zip.into zip.archiveBaseName
+            zip.destinationDirectory = project.rootProject.file("dist/client-api/sas")
         }
 )