cleaned up gradle file

DSLFoundry · Mar 1, 2021 · c084457 · c084457
1 parent bc5bb8a
commit c084457
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 29 deletions.
diff --git a/build.gradle b/build.gradle
@@ -69,7 +69,7 @@ def defaultScriptArgs = [
         'build.dir'                         : buildDir,
         'mps.generator.skipUnmodifiedModels': incrementalBuild,
         'version'                           : mbeddrCppVersion,
-		'mbeddr.cpp.version'				: mbeddrCppVersion,
+        'mbeddr.cpp.version'                : mbeddrCppVersion,
 ]
 def defaultScriptClasspath = project.configurations.junitAnt.fileCollection { true }
 
@@ -97,14 +97,8 @@ task setup {
     description 'Set up MPS project libraries. Libraries are read in from projectlibraries.properties file.'
 }
 
-ext.releaseArtifacts = { ->
-	{ -> new File(new File(artifactsDir, "com.mbeddr.cpp"), "com.mbeddr.cpp-${mbeddrCppVersion}.zip") }
-}
 
-//def releaseArtifacts = new File(new File(artifactsDir, "com.mbeddr.cpp")
-//        .listFiles()
-//        .findAll {it.name.endsWith("zip")}
-//        .each {it.absolutePath}
+def releaseArtifacts = ["${artifactsDir}/com.mbeddr.cpp/com.mbeddr.cpp-${mbeddrCppVersion}.zip"]
 
 github {
     owner = 'DSLFoundry'
@@ -113,35 +107,35 @@ github {
     tagName =  "v-$mbeddrCppVersion"
     targetCommitish = System.getenv().CI_COMMIT_SHA != null ? System.getenv().CI_COMMIT_SHA : "master"
     name =  "mbeddr C++ Extensions v$mbeddrCppVersion"
-    assets = ["${artifactsDir}/com.mbeddr.cpp/com.mbeddr.cpp-${mbeddrCppVersion}.zip"]
+    assets = releaseArtifacts
     // body = ReleaseNotes.getReleaseNotes(file("RELEASE_NOTES.md"))
 }
 
 publishing {
-	repositories {
-		maven {
-			name = "GitHubPackages"
+    repositories {
+        maven {
+            name = "GitHubPackages"
             url = uri("https://maven.pkg.github.com/DSLFoundry/mbeddr.core")
             credentials {
                 username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR")
                 password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
             }
-		}
-	}
-	
-	publications {
-		gpr(MavenPublication) {
-			groupId = 'com.mbeddr'
-			artifactId = 'cpp'
-			version = "$mbeddrCppVersion"
-			
-			artifacts = [releaseArtifacts()]
-			pom {
-				name = "mbeddr C++ Extensions"
-				url = "https://github.com/DSLFoundry/mbeddr.core"
-			}
-		}
-	}
+        }
+    }
+    
+    publications {
+        gpr(MavenPublication) {
+            groupId = 'com.mbeddr'
+            artifactId = 'cpp'
+            version = "$mbeddrCppVersion"
+            
+            artifacts = releaseArtifacts
+            pom {
+                name = "mbeddr C++ Extensions"
+                url = "https://github.com/DSLFoundry/mbeddr.core"
+            }
+        }
+    }
 }
 
 build.dependsOn buildLanguages

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-mbeddrCppVersion = 0.1.3
+mbeddrCppVersion = 0.1.4