Merge branch 'release/PROD_0.2.0'

Author: wowHollis

app/build.gradle

@@ -9,14 +9,72 @@ android {
         minSdkVersion 18
         targetSdkVersion 21
         versionCode 1
-        versionName "0.1.2"
+        versionName "0.2.0"
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    applicationVariants.all { variant ->
+        variant.outputs.each { output ->
+            def apk = output.outputFile;
+            def jenkinsUser = System.getProperty("user.name");
+            def newName;
+            if(jenkinsUser == "jenkins") {
+                newName = "Paragon_${variant.versionName}_${new Date().format("MM-dd-yyyy")}.apk"
+            }
+            else {
+                newName = "Paragon_${variant.versionName}.apk"
+            }
+            output.outputFile = new File(apk.parentFile, newName)
+        }
+    }
+
+    gradle.buildFinished {
+        moveApkToDeploy(this);
+    }
+
+}
+
+
+def moveApkToDeploy(project) {
+    def srcApkFolder = project.file("build/outputs/apk");
+    def jenkinsUser = System.getProperty("user.name");
+    def destPath;
+    if(jenkinsUser == "jenkins") {
+        destPath = "/Users/Shared/${System.getProperty("user.name")}/AutoGeneratedFile/Android/${project.parent.name}";
+    }
+    else {
+        destPath = "/Users/${System.getProperty("user.name")}/Desktop/${project.parent.name}";
+    }
+
+    new File(destPath).mkdirs();
+
+    File[] listOfFiles = srcApkFolder.listFiles();
+    if (listOfFiles == null || listOfFiles.size() == 0)
+        return;
+
+    // move
+    for (File f : listOfFiles) {
+        if (f.isFile()) {
+            println "target: ${f.getName()}"
+
+            InputStream input = new FileInputStream(f);
+            OutputStream output = new FileOutputStream(destPath + "/" + f.getName());
+
+            byte[] buffer = new byte[1024];
+            int length;
+
+            while ((length = input.read(buffer)) > 0)
+                output.write(buffer, 0, length);
+
+            input.close();
+            output.close();
+        }
+    }
 }
 
 repositories {

app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
         android:targetSdkVersion="21" />
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
 
     <uses-permission
@@ -19,6 +20,7 @@
                   android:required="true" />
 
     <application
+        android:name=".FirstBuildApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -42,7 +44,8 @@
             android:name=".paragon.ParagonMainActivity"
             android:label="@string/title_activity_paragon_main"
             android:windowSoftInputMode="adjustUnspecified|adjustPan"
-            android:screenOrientation="portrait" >
+            android:screenOrientation="portrait"
+            android:parentActivityName="com.firstbuild.androidapp.dashboard.DashboardActivity">
         </activity>
         <activity
             android:name=".addProduct.AddProductActivity"