Improved the code related to 'publish' task.

Prepared release 23.12.1

Author: Aleksander Grinin

app/build.gradle

@@ -6,7 +6,8 @@ def proguardFileName = "gradles/proguard.app.conf"
 //def githubProperties = new Properties()
 //githubProperties.load(new FileInputStream(rootProject.file("github.properties")))
 
-def githubProperties = GradleAssist.readProperties("$rootDir/github.properties");
+//def githubProperties = GradleAssist.readProperties("$rootDir/github.properties");
+def githubCredentials = GradleAssist.readGitHubCredentials("$rootDir/local.environment");
 
 publishing {
     publications {
@@ -24,8 +25,10 @@ publishing {
             url = uri("https://maven.pkg.github.com/aspose-barcode/Barcode_Android_Application")
 
             credentials {
-                username = githubProperties['github.user']
-                password = githubProperties['github.key']
+//                username = githubProperties['github.user']
+//                password = githubProperties['github.key']
+                username = githubCredentials.userName;
+                password = githubCredentials.password;
             }
         }
     }
@@ -93,10 +96,11 @@ task copyApk(type: Copy) {
     }
     destinationDir(file("$publishPath"))
     doFirst {
-        logger.info('\n### Executing copyApk')
+        logger.info('\n### copyApk started')
     }
     doLast {
         logger.info("copied  $apkFinalName  to  $publishPath")
+        logger.info('\n### copyApk completed')
     }
 }
 
@@ -115,6 +119,23 @@ gradle.taskGraph.whenReady { taskGraph ->
     }
 }
 
+task clearGeneratedFiles {
+    def treePublish = fileTree("$rootDir/publish")
+    treePublish.include '*.apk'
+    treePublish.exclude '*.gitignore'
+
+    doFirst {
+        delete(treePublish)
+        delete("$projectDir/out")
+        delete("$buildDir")
+        logger.info("clearGeneratedFiles started")
+    }
+    doLast {
+        logger.info("clearGeneratedFiles completed")
+    }
+}
+
+clean.dependsOn 'clearGeneratedFiles'
 preBuild.dependsOn('echoBuildParameters')
 copyApk.dependsOn 'check'
 build.dependsOn 'copyApk'

build.gradle

@@ -25,7 +25,7 @@ project.ext {
     versionName = project.ext.get('version_name')
     groupId = "com.aspose.barcode.android"
     artifactFinalName = "android-barcode-application"
-    apkFinalName = artifactFinalName + ".apk"
+    apkFinalName = artifactFinalName + "-" + versionName + ".apk"
     logPath = "${rootDir}/app/logs"
 }
 

buildSrc/src/main/java/GitHubCredentials.java

@@ -0,0 +1,21 @@
+public class GitHubCredentials
+{
+    private final String userName;
+    private final String password;
+
+    public GitHubCredentials(String userName, String password)
+    {
+        this.userName = userName;
+        this.password = password;
+    }
+
+    public String getUserName()
+    {
+        return userName;
+    }
+
+    public String getPassword()
+    {
+        return password;
+    }
+}

buildSrc/src/main/java/GradleAssist.java

@@ -6,11 +6,6 @@ public class GradleAssist
 {
     private static String TAG = "## GradleAssist ->";
 
-    public static void sayHi()
-    {
-        System.out.println("HI");
-    }
-
     public static Properties readProperties(String filePath)
     {
         Properties properties = new Properties();
@@ -33,4 +28,13 @@ public static Properties readProperties(String filePath)
         }
         return properties;
     }
+
+    public static GitHubCredentials readGitHubCredentials(String filePath)
+    {
+        Properties properties = readProperties(filePath);
+        String userName = properties.get("github.user").toString();
+        String key = properties.get("github.key").toString();
+        GitHubCredentials gitHubCredentials = new GitHubCredentials(userName, key);
+        return gitHubCredentials;
+    }
 }

github.properties

@@ -20,4 +20,4 @@ android.useAndroidX=true
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 obfuscate_apk = false
-version_name = 23.12.0
+version_name = 23.12.1