From 21c73e43e3358ea565bc908eaa871e9c73f643d2 Mon Sep 17 00:00:00 2001 From: Anil Nair Date: Mon, 3 Dec 2018 12:11:16 +0000 Subject: [PATCH 01/18] New Circle CI configuration --- .circleci/config.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000..8bfeeb36 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,25 @@ +version: 2 +jobs: + build: + working_directory: ~/code + docker: + - image: circleci/android:api-23-alpha + environment: + JVM_OPTS: -Xmx3200m + steps: + - checkout + - restore_cache: + key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} + - run: + name: Download Dependencies + command: ./gradlew androiDependencies + - save_cache: + paths: + - ~/.gradle + keys: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} + - run: + name: Run Build + command: ./gradlew clean assembleDebug --recompile-scripts --refresh-dependencies --parallel --stacktrace + - store_artifacts: + path: app/build/outputs/apk/apk-debug.apk + destination: outputs From bea186df6ad84073576d3281a6c7ea64152059d7 Mon Sep 17 00:00:00 2001 From: Anil Nair Date: Mon, 3 Dec 2018 12:16:21 +0000 Subject: [PATCH 02/18] Rectified step 4 of Circle CI configuration --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8bfeeb36..9c139937 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: - save_cache: paths: - ~/.gradle - keys: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} + key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} - run: name: Run Build command: ./gradlew clean assembleDebug --recompile-scripts --refresh-dependencies --parallel --stacktrace From 166497dd60f03422a40967102e5223cfa677e054 Mon Sep 17 00:00:00 2001 From: Anil Nair Date: Mon, 3 Dec 2018 12:19:26 +0000 Subject: [PATCH 03/18] Removed step of gradle Dependencies --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9c139937..17679eb3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,9 +10,6 @@ jobs: - checkout - restore_cache: key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} - - run: - name: Download Dependencies - command: ./gradlew androiDependencies - save_cache: paths: - ~/.gradle From 7bdfb189e7b72ce236e4fae54e4909310158dfa4 Mon Sep 17 00:00:00 2001 From: Anil Nair Date: Mon, 3 Dec 2018 12:22:53 +0000 Subject: [PATCH 04/18] Rectified code src directory --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 17679eb3..3c3c8926 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2 jobs: build: - working_directory: ~/code + working_directory: ~/app docker: - image: circleci/android:api-23-alpha environment: From 8ca752539d6d0ec63845397ff863bf113281badf Mon Sep 17 00:00:00 2001 From: Anil Nair Date: Mon, 3 Dec 2018 12:24:05 +0000 Subject: [PATCH 05/18] Added Full Path of Source Directory --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3c3c8926..9fa0df2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2 jobs: build: - working_directory: ~/app + working_directory: ~/app/src/main docker: - image: circleci/android:api-23-alpha environment: From dd081ccdcabda92e1f19d8ade0f46014d259eb73 Mon Sep 17 00:00:00 2001 From: Anil Nair Date: Mon, 3 Dec 2018 12:27:05 +0000 Subject: [PATCH 06/18] Rectified Build Error For TERM not set Circle CI --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9fa0df2f..62d28ac6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} - run: name: Run Build - command: ./gradlew clean assembleDebug --recompile-scripts --refresh-dependencies --parallel --stacktrace + command: export TERM=${TERM:-dumb} && ./gradlew clean assembleDebug --recompile-scripts --refresh-dependencies --parallel --stacktrace - store_artifacts: path: app/build/outputs/apk/apk-debug.apk destination: outputs From cd68fb43064ee9fd2ae710bfad23f7ac9da4afde Mon Sep 17 00:00:00 2001 From: Anil Nair Date: Mon, 3 Dec 2018 12:57:38 +0000 Subject: [PATCH 07/18] Changed Build Tools version for Circle CI builds --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index c81209e3..50e2842b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion "23.0.3" + buildToolsVersion "23.0.1" defaultConfig { applicationId "io.Pushjet.api" From 76277c160c36fa9b053f329c2e4ebe482b0aa42f Mon Sep 17 00:00:00 2001 From: Anil Nair <36132237+anilrobo90@users.noreply.github.com> Date: Mon, 3 Dec 2018 16:52:54 +0530 Subject: [PATCH 08/18] Updated Build versions for Circle CI builds --- app/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 50e2842b..259ed208 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 25 + buildToolsVersion "25.0.0" defaultConfig { applicationId "io.Pushjet.api" minSdkVersion 15 - targetSdkVersion 23 + targetSdkVersion 25 versionCode 6 versionName "1.4" } From c5f5052fa5652ce3d776faebc61fb815d84b0abe Mon Sep 17 00:00:00 2001 From: Anil Nair <36132237+anilrobo90@users.noreply.github.com> Date: Mon, 3 Dec 2018 16:54:20 +0530 Subject: [PATCH 09/18] Updated config file build version for Circle CI Builds --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 62d28ac6..6ba99ed7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build: working_directory: ~/app/src/main docker: - - image: circleci/android:api-23-alpha + - image: circleci/android:api-25-alpha environment: JVM_OPTS: -Xmx3200m steps: From 80fc38087894acc53546b498c2f8f7553b7357d5 Mon Sep 17 00:00:00 2001 From: Anil Nair <36132237+anilrobo90@users.noreply.github.com> Date: Mon, 3 Dec 2018 17:36:33 +0530 Subject: [PATCH 10/18] Removed al the build options Adding one by one : v1 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ba99ed7..7650e81e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} - run: name: Run Build - command: export TERM=${TERM:-dumb} && ./gradlew clean assembleDebug --recompile-scripts --refresh-dependencies --parallel --stacktrace + command: export TERM=${TERM:-dumb} && ./gradlew assembleDebug - store_artifacts: path: app/build/outputs/apk/apk-debug.apk destination: outputs From f7b8da43bc0b83d1c4f26c2136c3f4aa4e58dcbb Mon Sep 17 00:00:00 2001 From: Anil Nair <36132237+anilrobo90@users.noreply.github.com> Date: Mon, 3 Dec 2018 17:45:55 +0530 Subject: [PATCH 11/18] Update circle CI configuration file : v2 --- app/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 259ed208..7274ecde 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,6 +11,10 @@ android { versionCode 6 versionName "1.4" } + dexOptions { + javaMaxHeapSize "4g" + preDexLibraries = false + } buildTypes { release { minifyEnabled false From fadcb5abfc08d9db7a0671e40347cc59c36540fb Mon Sep 17 00:00:00 2001 From: Anil Nair <36132237+anilrobo90@users.noreply.github.com> Date: Mon, 3 Dec 2018 17:51:44 +0530 Subject: [PATCH 12/18] Update circle CI configuration file : v3 --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7650e81e..955cabc3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2 jobs: build: - working_directory: ~/app/src/main + working_directory: ~/app/ docker: - image: circleci/android:api-25-alpha environment: @@ -16,7 +16,7 @@ jobs: key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} - run: name: Run Build - command: export TERM=${TERM:-dumb} && ./gradlew assembleDebug + command: export TERM=${TERM:-dumb} && ./gradlew assembleDebug --recompile-scripts --refresh-dependencies --parallel --stacktrace - store_artifacts: - path: app/build/outputs/apk/apk-debug.apk + path: build/outputs/apk/apk-debug.apk destination: outputs From a5db218b9cc94a872565d6afc285e08d23a277df Mon Sep 17 00:00:00 2001 From: Anil Nair <36132237+anilrobo90@users.noreply.github.com> Date: Mon, 3 Dec 2018 17:57:50 +0530 Subject: [PATCH 13/18] Added Badge for Circle CI --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1a2f5099..76270564 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -The Pushjet Android Client [![Circle CI](https://circleci.com/gh/Pushjet/Pushjet-Android.svg?style=svg)](https://circleci.com/gh/Pushjet/Pushjet-Android) [![License](http://img.shields.io/badge/license-BSD-blue.svg?style=flat)](/LICENSE) +The Pushjet Android Client [![CircleCI](https://circleci.com/gh/anilrobo90/Pushjet-Android.svg?style=svg)](https://circleci.com/gh/anilrobo90/Pushjet-Android) [![License](http://img.shields.io/badge/license-BSD-blue.svg?style=flat)](/LICENSE) ========================== This is the pushjet android client. It currently uses google GCM to send and receive messages. This means that any message that is directed at the android client *will* go through google. The client is licensed From 7c2af3ce72c4746a26d30a8ae158d40dd4b8862c Mon Sep 17 00:00:00 2001 From: Anil Nair <36132237+anilrobo90@users.noreply.github.com> Date: Mon, 3 Dec 2018 18:23:20 +0530 Subject: [PATCH 14/18] Updated Circle CI to store Artifacts. --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 955cabc3..2f7be01f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} - run: name: Run Build - command: export TERM=${TERM:-dumb} && ./gradlew assembleDebug --recompile-scripts --refresh-dependencies --parallel --stacktrace + command: export TERM=${TERM:-dumb} && ./gradlew assembleDebug --recompile-scripts --refresh-dependencies --parallel --stacktrace && mkdir -p /tmp/apks/ && cp ~/app/build/outputs/apk/apk-debug.apk /tmp/apks/ - store_artifacts: - path: build/outputs/apk/apk-debug.apk - destination: outputs + path: /tmp/apks/ + destination: apks/ From 34d692b967685a89ddd78e424ac276bdca7715fd Mon Sep 17 00:00:00 2001 From: Anil Nair <36132237+anilrobo90@users.noreply.github.com> Date: Mon, 3 Dec 2018 18:38:30 +0530 Subject: [PATCH 15/18] Updated Circle CI configuration to store artifact. --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f7be01f..4947c703 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2 jobs: build: - working_directory: ~/app/ + working_directory: ~/code docker: - image: circleci/android:api-25-alpha environment: @@ -16,7 +16,7 @@ jobs: key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} - run: name: Run Build - command: export TERM=${TERM:-dumb} && ./gradlew assembleDebug --recompile-scripts --refresh-dependencies --parallel --stacktrace && mkdir -p /tmp/apks/ && cp ~/app/build/outputs/apk/apk-debug.apk /tmp/apks/ + command: export TERM=${TERM:-dumb} && ./gradlew build --recompile-scripts --refresh-dependencies --parallel --stacktrace - store_artifacts: - path: /tmp/apks/ - destination: apks/ + path: app/build/outputs/apk/debug/ + destination: artifact-file From 25b7d456dbac2f7663175f494617a2852ad21e7f Mon Sep 17 00:00:00 2001 From: Anil Nair <36132237+anilrobo90@users.noreply.github.com> Date: Mon, 3 Dec 2018 18:42:14 +0530 Subject: [PATCH 16/18] Added wildstar to add all versions of apk to articfact --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4947c703..fb460f73 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,5 +18,5 @@ jobs: name: Run Build command: export TERM=${TERM:-dumb} && ./gradlew build --recompile-scripts --refresh-dependencies --parallel --stacktrace - store_artifacts: - path: app/build/outputs/apk/debug/ + path: app/build/outputs/apk/debug/*.apk destination: artifact-file From 1c93808f3fc52ba8e4cc287e0aa11f92b33d8685 Mon Sep 17 00:00:00 2001 From: Anil Nair <36132237+anilrobo90@users.noreply.github.com> Date: Mon, 3 Dec 2018 18:44:24 +0530 Subject: [PATCH 17/18] Updated Circel CI config file to clean previous build releases --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fb460f73..fba4a56c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} - run: name: Run Build - command: export TERM=${TERM:-dumb} && ./gradlew build --recompile-scripts --refresh-dependencies --parallel --stacktrace + command: export TERM=${TERM:-dumb} && ./gradlew clean build --recompile-scripts --refresh-dependencies --parallel --stacktrace - store_artifacts: path: app/build/outputs/apk/debug/*.apk destination: artifact-file From 37dd9c8081a178a5ac584b78d70dd35e636be5a9 Mon Sep 17 00:00:00 2001 From: Anil Nair <36132237+anilrobo90@users.noreply.github.com> Date: Mon, 3 Dec 2018 18:47:15 +0530 Subject: [PATCH 18/18] Rectified Error in Path for storing artifacts Circle CI --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fba4a56c..9a23d6b3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,5 +18,5 @@ jobs: name: Run Build command: export TERM=${TERM:-dumb} && ./gradlew clean build --recompile-scripts --refresh-dependencies --parallel --stacktrace - store_artifacts: - path: app/build/outputs/apk/debug/*.apk + path: app/build/outputs/apk/ destination: artifact-file