From 4e4aa475c801b99cb4f294ae3544709bf149932e Mon Sep 17 00:00:00 2001 From: Lavanya gaur <33238323+Lavanyagaur22@users.noreply.github.com> Date: Tue, 12 Nov 2019 02:54:31 +0530 Subject: [PATCH 1/7] Update README.md (#166) * Update README.md * Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 56d3243..52259b2 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,10 @@ See [offix website](https://android.offix.dev) for usage and more details. See [sample](https://github.com/aerogear/offix-android/tree/master/sample) for example application.
- +## Presentation Link + +https://docs.google.com/presentation/d/1SzAfRQTqfMtXbp6jFfr99jkIjjZWslX3tU2Wkoec2Uk/edit?usp=sharing + ## Contributing See [contribution guidelines](./CONTRIBUTING.md) file for more information From 763824a951a1c4de4a3854e45cf669468e9fc466 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 16:01:11 +0530 Subject: [PATCH 2/7] Bump knex from 0.19.1 to 0.19.5 in /sample/server (#165) Bumps [knex](https://github.com/tgriesser/knex) from 0.19.1 to 0.19.5. - [Release notes](https://github.com/tgriesser/knex/releases) - [Changelog](https://github.com/knex/knex/blob/master/CHANGELOG.md) - [Commits](https://github.com/tgriesser/knex/commits/0.19.5) Signed-off-by: dependabot[bot] --- sample/server/package-lock.json | 55 ++++++++++++++++++++------------- sample/server/package.json | 2 +- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/sample/server/package-lock.json b/sample/server/package-lock.json index de85b74..587cf67 100644 --- a/sample/server/package-lock.json +++ b/sample/server/package-lock.json @@ -708,9 +708,9 @@ } }, "bluebird": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz", - "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==" + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz", + "integrity": "sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==" }, "body-parser": { "version": "1.19.0", @@ -952,9 +952,9 @@ } }, "colorette": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.0.8.tgz", - "integrity": "sha512-X6Ck90ReaF+EfKdVGB7vdIQ3dr651BbIrBwY5YBKg13fjH+940sTtp7/Pkx33C6ntYfQcRumOs/aUQhaRPpbTQ==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.1.0.tgz", + "integrity": "sha512-6S062WDQUXi6hOfkO/sBPVwE5ASXY4G2+b4atvhJfSsuUUhIaUKlkjLe9692Ipyt5/a+IPF5aVTu3V5gvXq5cg==" }, "colornames": { "version": "1.1.1", @@ -986,7 +986,8 @@ "commander": { "version": "2.20.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==" + "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", + "dev": true }, "component-emitter": { "version": "1.3.0", @@ -1642,9 +1643,9 @@ "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" }, "getopts": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/getopts/-/getopts-2.2.4.tgz", - "integrity": "sha512-Rz7DGyomZjrenu9Jx4qmzdlvJgvrEFHXHvjK0FcZtcTC1U5FmES7OdZHUwMuSnEE6QvBvwse1JODKj7TgbSEjQ==" + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/getopts/-/getopts-2.2.5.tgz", + "integrity": "sha512-9jb7AW5p3in+IiJWhQiZmmwkpLaR/ccTWdWQCtZM66HJcHHLegowh4q4tSD7gouUyeNvFWRavfK9GXosQHDpFA==" }, "getpass": { "version": "0.1.7", @@ -2209,27 +2210,32 @@ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" }, "knex": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/knex/-/knex-0.19.1.tgz", - "integrity": "sha512-Y25eu5xMv8h/2/98YQqGMPzzo0AYs/HluST6BR8vkGfRyhme0A51jyCde4y4QInJo2GokrUzrXqlKDqqERg+nQ==", + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/knex/-/knex-0.19.5.tgz", + "integrity": "sha512-Hy258avCVircQq+oj3WBqPzl8jDIte438Qlq+8pt1i/TyLYVA4zPh2uKc7Bx0t+qOpa6D42HJ2jjtl2vagzilw==", "requires": { - "bluebird": "^3.5.5", - "colorette": "1.0.8", - "commander": "^2.20.0", + "bluebird": "^3.7.0", + "colorette": "1.1.0", + "commander": "^3.0.2", "debug": "4.1.1", - "getopts": "2.2.4", + "getopts": "2.2.5", "inherits": "~2.0.4", "interpret": "^1.2.0", "liftoff": "3.1.0", "lodash": "^4.17.15", "mkdirp": "^0.5.1", - "pg-connection-string": "2.0.0", + "pg-connection-string": "2.1.0", "tarn": "^2.0.0", "tildify": "2.0.0", - "uuid": "^3.3.2", + "uuid": "^3.3.3", "v8flags": "^3.1.3" }, "dependencies": { + "commander": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz", + "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==" + }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -2242,6 +2248,11 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "uuid": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz", + "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==" } } }, @@ -2819,9 +2830,9 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "pg-connection-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.0.0.tgz", - "integrity": "sha1-Pu/lmX4G2Ugh5NUC5CtqHHP434I=" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.1.0.tgz", + "integrity": "sha512-bhlV7Eq09JrRIvo1eKngpwuqKtJnNhZdpdOlvrPrA4dxqXPjxSrbNrfnIDmTpwMyRszrcV4kU5ZA4mMsQUrjdg==" }, "posix-character-classes": { "version": "0.1.1", diff --git a/sample/server/package.json b/sample/server/package.json index 3422e68..30f690d 100644 --- a/sample/server/package.json +++ b/sample/server/package.json @@ -20,7 +20,7 @@ "graphql-redis-subscriptions": "2.1.1", "graphql-tag": "2.10.1", "ioredis": "4.14.0", - "knex": "0.19.1", + "knex": "0.19.5", "offix-conflicts-server": "^0.8.0", "sofa-api": "0.4.0", "sqlite3": "^4.0.9" From d3ee0f79123097ed4b5ef49cd0a01d5f8e302d54 Mon Sep 17 00:00:00 2001 From: crowded Date: Mon, 9 Dec 2019 23:28:14 +0530 Subject: [PATCH 3/7] Codecov Added Travis Badge Added --- .travis.yml | 49 ++++++++++++++++++++++++++++++++++++++++++++++ README.md | 2 ++ offix/build.gradle | 3 +++ 3 files changed, 54 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..b69eae9 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,49 @@ +language: android +sudo: required +jdk: oraclejdk8 +env: + global: + - ANDROID_TARGET=android-28 + - ANDROID_ABI=armeabi-v7a + - CODECOV_TOKEN=f93aa7c8-1579-4687-870f-cc6e08a93316 +android: + components: + - tools + - platform-tools + - build-tools-28.0.0 + - android-28 + - extra-google-google_play_services + - extra-google-m2repository + - extra-android-m2repository + - $ANDROID_TARGET + - sys-img-${ANDROID_ABI}-${ANDROID_TARGET} + +licenses: + - 'android-sdk-license-.+' + +before_install: + - yes | sdkmanager "platforms;android-28" + - chmod +x ./gradlew + - mkdir "$ANDROID_HOME/licenses" || true + - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license" + - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license" + - yes | sdkmanager --update + - yes | sdkmanager --licenses + +script: + - echo "Hello! This is Travis" + - ./gradlew build jacocoTestReport + +after_success: + - bash <(curl -s https://codecov.io/bash) -t ${CODECOV_TOKEN} + + +before_cache: + - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ + +cache: + directories: + - $HOME/.gradle/caches/ + - $HOME/.gradle/wrapper/ + - $HOME/.android/build-cache \ No newline at end of file diff --git a/README.md b/README.md index 52259b2..1b695ee 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Build Status](https://travis-ci.org/crowded-geek/offix-android.svg?branch=master)](https://travis-ci.org/crowded-geek/offix-android) +[![codecov](https://codecov.io/gh/crowded-geek/offix-android/branch/master/graph/badge.svg)](https://codecov.io/gh/crowded-geek/offix-android)


diff --git a/offix/build.gradle b/offix/build.gradle index 57776c0..07caaea 100644 --- a/offix/build.gradle +++ b/offix/build.gradle @@ -3,6 +3,7 @@ apply plugin: 'com.apollographql.android' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-android-extensions' +apply plugin: 'jacoco-android' buildscript { repositories { @@ -11,6 +12,7 @@ buildscript { dependencies { classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' + classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4' } } @@ -35,6 +37,7 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } + } } From 95f67b3e46775e32ab8473ab8cedef33b6ecf372 Mon Sep 17 00:00:00 2001 From: Lavanya gaur <33238323+Lavanyagaur22@users.noreply.github.com> Date: Thu, 12 Dec 2019 00:54:25 +0530 Subject: [PATCH 4/7] Revert "Codecov Added" (#177) --- .travis.yml | 49 ---------------------------------------------- README.md | 2 -- offix/build.gradle | 3 --- 3 files changed, 54 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b69eae9..0000000 --- a/.travis.yml +++ /dev/null @@ -1,49 +0,0 @@ -language: android -sudo: required -jdk: oraclejdk8 -env: - global: - - ANDROID_TARGET=android-28 - - ANDROID_ABI=armeabi-v7a - - CODECOV_TOKEN=f93aa7c8-1579-4687-870f-cc6e08a93316 -android: - components: - - tools - - platform-tools - - build-tools-28.0.0 - - android-28 - - extra-google-google_play_services - - extra-google-m2repository - - extra-android-m2repository - - $ANDROID_TARGET - - sys-img-${ANDROID_ABI}-${ANDROID_TARGET} - -licenses: - - 'android-sdk-license-.+' - -before_install: - - yes | sdkmanager "platforms;android-28" - - chmod +x ./gradlew - - mkdir "$ANDROID_HOME/licenses" || true - - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license" - - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license" - - yes | sdkmanager --update - - yes | sdkmanager --licenses - -script: - - echo "Hello! This is Travis" - - ./gradlew build jacocoTestReport - -after_success: - - bash <(curl -s https://codecov.io/bash) -t ${CODECOV_TOKEN} - - -before_cache: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ - -cache: - directories: - - $HOME/.gradle/caches/ - - $HOME/.gradle/wrapper/ - - $HOME/.android/build-cache \ No newline at end of file diff --git a/README.md b/README.md index 1b695ee..52259b2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -[![Build Status](https://travis-ci.org/crowded-geek/offix-android.svg?branch=master)](https://travis-ci.org/crowded-geek/offix-android) -[![codecov](https://codecov.io/gh/crowded-geek/offix-android/branch/master/graph/badge.svg)](https://codecov.io/gh/crowded-geek/offix-android)


diff --git a/offix/build.gradle b/offix/build.gradle index 07caaea..57776c0 100644 --- a/offix/build.gradle +++ b/offix/build.gradle @@ -3,7 +3,6 @@ apply plugin: 'com.apollographql.android' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-android-extensions' -apply plugin: 'jacoco-android' buildscript { repositories { @@ -12,7 +11,6 @@ buildscript { dependencies { classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' - classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4' } } @@ -37,7 +35,6 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } - } } From f5e0b4ac424638f1b9d0accf4a35dc2c088e7e8a Mon Sep 17 00:00:00 2001 From: reaganiwadha Date: Tue, 7 Jan 2020 01:18:02 +0700 Subject: [PATCH 5/7] Added travis file and JaCoCo Added travis file and JaCoCo #2 Added travis file and JaCoCo #3 Added travis file and JaCoCo #4 Changed ANDROID_ABI from armeabi to arm64 Added travis file and JaCoCo #5 Removed AVD Test Added travis file and JaCoCo #6 after_success, not after_install --- .travis.yml | 37 +++++++++++++++++++++++++++++++++++++ build.gradle | 2 +- sample/build.gradle | 18 ++++++++++++++++-- 3 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..ac1ba17 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,37 @@ +language: android +jdk: oraclejdk8 +sudo: false + +env: + global: + - ANDROID_TARGET=android-28 + - ANDROID_ABI=arm64-v8a + +android: + components: + - tools + - build-tools-28.0.3 + - android-28 + +before_cache: + - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ + +cache: + directories: + - $HOME/.gradle/caches/ + - $HOME/.gradle/wrapper/ + - $HOME/.android/build-cache + +before_install: + - chmod +x gradlew + +script: + - ./gradlew build jacocoTestReport + +after_success: + - bash <(curl -s https://codecov.io/bash) -t ${TOKEN_CODECOV} + +licenses: + - 'android-sdk-license-.+' + - 'google-gdk-license-.+' \ No newline at end of file diff --git a/build.gradle b/build.gradle index 9d0da36..11ebf1e 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.5.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.apollographql.apollo:apollo-gradle-plugin:1.2.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/sample/build.gradle b/sample/build.gradle index 0bb25da..f7ca96b 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,12 +1,23 @@ +buildscript{ + repositories{ + jcenter() + } + dependencies{ + classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4' + } +} + apply plugin: 'com.android.application' apply plugin: 'com.apollographql.android' apply plugin: 'kotlin-android' - apply plugin: 'kotlin-kapt' - apply plugin: 'kotlin-android-extensions' +apply plugin: 'jacoco-android' + + + android { compileSdkVersion 28 @@ -23,6 +34,9 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + debug{ + testCoverageEnabled true + } } } From 4a6b9d458e92db9024dd64e692e086f9f0ab877f Mon Sep 17 00:00:00 2001 From: reaganiwadha Date: Tue, 7 Jan 2020 02:18:37 +0700 Subject: [PATCH 6/7] Added Codecov and Travis CI Badge to README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 52259b2..20c5761 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ +[![Build Status](https://travis-ci.org/reaganiwadha/offix-android.svg?branch=master)] +[![Code Coverage](https://codecov.io/gh/reaganiwadha/offix-android/branch/master/graph/badge.svg)] +


From 0128db8b671c637631709f481174ff1951eed245 Mon Sep 17 00:00:00 2001 From: reaganiwadha Date: Tue, 7 Jan 2020 02:20:11 +0700 Subject: [PATCH 7/7] Fixed README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 20c5761..a571412 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![Build Status](https://travis-ci.org/reaganiwadha/offix-android.svg?branch=master)] -[![Code Coverage](https://codecov.io/gh/reaganiwadha/offix-android/branch/master/graph/badge.svg)] +[![Build Status](https://travis-ci.org/reaganiwadha/offix-android.svg?branch=master)](https://travis-ci.com/reaganiwadha/offix-android) +[![Code Coverage](https://codecov.io/gh/reaganiwadha/offix-android/branch/master/graph/badge.svg)](https://travis-ci.com/reaganiwadha/offix-android)