Merge pull request #2 from modularni-urad/fixes-v0.2

Fixes for CircleCI support

.circleci/config.yml

@@ -3,36 +3,36 @@ jobs:
   build:
     working_directory: ~/code
     docker:
-      - image: circleci/android:api-28-alpha
+      - image: circleci/android:api-28
     environment:
       JVM_OPTS: -Xmx3200m
     steps:
       - checkout
       - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "hello_lib/build.gradle" }}-{{ checksum  "hello_android_app/build.gradle" }}-{{ checksum  "hello_js_browser_app/build.gradle" }}-{{ checksum  "hello_js_node_app/build.gradle" }}-{{ checksum  "hello_jvm_app/build.gradle" }}
-      #      - run:
-      #         name: Chmod permissions #if permission for Gradlew Dependencies fail, use this.
-      #         command: sudo chmod +x ./gradlew
-#      - run:
-#          name: Install Android NDK
-#          command: source ./.circleci/circleCiEnvironmentSetup.sh && getAndroidNDK
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "opensmsgw/build.gradle" }}
       - run:
           name: Download Dependencies
           command: ./gradlew androidDependencies
       - save_cache:
           paths:
             - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
-      - run: echo $ENCODED_KEYSTORE | base64 --decode >> ${HOME}/code/keystore.jks
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "opensmsgw/build.gradle" }}
+      - run: echo "$ENCODED_KEYSTORE" | base64 --decode >> ${HOME}/code/keystore.jks
       - run: echo 'export KEYSTORE=${HOME}/code/keystore.jks' >> $BASH_ENV
       - run:
           name: Run Tests
           command: ./gradlew lint test
       - run:
           name: Build
           command: ./gradlew build
+      - run:
+          name: Make APK
+          command: ./gradlew packageRelease
       - store_artifacts: # for display in Artifacts: https://circleci.com/docs/2.0/artifacts/
-          path: app/build/reports
+          path: opensmsgw/build/reports
           destination: reports
-            - store_test_results: # for display in Test Summary: https://circleci.com/docs/2.0/collect-test-data/
-                path: app/build/test-results
+      - store_artifacts: # for display in Artifacts: https://circleci.com/docs/2.0/artifacts/
+          path: opensmsgw/build/outputs/apk/release
+          destination: apk
+      - store_test_results: # for display in Test Summary: https://circleci.com/docs/2.0/collect-test-data/
+          path: opensmsgw/build/test-results

README.md

@@ -1,3 +1,4 @@
+[![CircleCI](https://circleci.com/gh/modularni-urad/open-sms-gateway-android/tree/master.svg?style=svg)](https://circleci.com/gh/modularni-urad/open-sms-gateway-android/tree/master)
 # Open SMS Gateway Android node
 Application connects to the [server part](https://github.com/modularni-urad/open-sms-gateway) using WebSockets and receiving commands for sending SMSes from there. It is running as a service under Android.
 

app/.gitignore → opensmsgw/.gitignore

@@ -1 +1,2 @@
 /build
+release

app/build.gradle → opensmsgw/build.gradle

@@ -6,15 +6,25 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 28
+    def versionStr = "0.2.0"
+
     defaultConfig {
         applicationId "cz.sazel.android.opensmsgw"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 1
-        versionName "0.1"
+        versionCode 2
+        versionName "$versionStr"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    applicationVariants.all { variant ->
+        variant.outputs.all { output ->
+            outputFileName = new File(
+                    output.outputFile.name,
+                    output.outputFile.name.replace(".apk", "-${versionStr}.apk"))
+        }
+    }
+
     signingConfigs {
 
         release {

settings.gradle

@@ -1 +1 @@
-include ':app'
+include ':opensmsgw'