From c0e5d483c9fcd801eb19902324d7b363c02bd5cf Mon Sep 17 00:00:00 2001 From: NCMB Admin Date: Mon, 7 Sep 2020 11:18:32 +0900 Subject: [PATCH 1/5] Add .circleci/config.yml --- .circleci/config.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..d83c601 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,13 @@ +version: 2.1 + +orbs: + android: circleci/android@0.2.1 + +jobs: + build: + executor: android/android + + steps: + - checkout + - run: + command: ./gradlew build From 599e6d8d58113312a1593c38b6197a73dc71bdaf Mon Sep 17 00:00:00 2001 From: "dinh.thuy.duong" Date: Mon, 7 Sep 2020 11:42:58 +0900 Subject: [PATCH 2/5] Update config to aws connect --- .circleci/config.yml | 49 +++++++++++++++++++++++++++++++++++++------- app/build.gradle | 21 ++++++++++++++++--- build.gradle | 1 + 3 files changed, 61 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d83c601..f50c3a3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,13 +1,48 @@ -version: 2.1 - -orbs: - android: circleci/android@0.2.1 +version: 2 jobs: build: - executor: android/android - + working_directory: ~/code + docker: + - image: circleci/android:api-28-alpha + environment: + JVM_OPTS: -Xmx3200m + steps: + - checkout + - run: + name: Download dependencies + command: ./gradlew androidDependencies + - run: + name: Run Tests + command: ./gradlew lint test + - run: + name: Build debug apk and release apk + command: | + ./gradlew :app:assembleDebug + ./gradlew :app:assembleDebugAndroidTest + - store_artifacts: + path: app/build/reports + destination: reports + - store_test_results: + path: app/build/test-results + device_farm: + docker: + - image: circleci/android:api-28-alpha steps: - checkout - run: - command: ./gradlew build + name: AWS DeviceFarm + command: ./gradlew :app:devicefarmUpload +workflows: + version: 2 + build_and_test: + jobs: + - build + - device_farm: + requires: + - build + filters: + branches: + only: + - master + - circleci-project-setup diff --git a/app/build.gradle b/app/build.gradle index ee1ce7e..b7723b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,29 @@ apply plugin: 'com.android.application' +apply plugin: 'devicefarm' + +def envAccessKey = ENV_ACCESS_KEY +def envSecretKey = ENV_SECRET_KEY + +devicefarm { + projectName "sci01445_android" + authentication { + accessKey envAccessKey + secretKey envSecretKey + } + // Fuzz + fuzz { } +} android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "ncmbdataquick.mbaas.com.nifcloud.datastorequickstart" minSdkVersion 15 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -21,7 +36,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) testImplementation 'junit:junit:4.12' - implementation 'com.android.support:appcompat-v7:27.0.1' + implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support:design:27.0.1' implementation 'com.google.code.gson:gson:2.3.1' implementation files('libs/NCMB.jar') diff --git a/build.gradle b/build.gradle index a960ab3..db64d63 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,7 @@ buildscript { classpath 'com.android.tools.build:gradle:3.4.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files + classpath 'com.amazonaws:aws-devicefarm-gradle-plugin:1.3' } } From 4b20270767a25de3ebba1b0969ac5ed70afa7315 Mon Sep 17 00:00:00 2001 From: "dinh.thuy.duong" Date: Mon, 7 Sep 2020 13:05:51 +0900 Subject: [PATCH 3/5] Update build.gradle --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index b7723b4..bc40219 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,7 +37,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) testImplementation 'junit:junit:4.12' implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:design:27.0.1' + implementation 'com.android.support:design:28.0.0' implementation 'com.google.code.gson:gson:2.3.1' implementation files('libs/NCMB.jar') } From c6d2598bc4147827890f2dea3da81f1373ebd2eb Mon Sep 17 00:00:00 2001 From: "dinh.thuy.duong" Date: Mon, 7 Sep 2020 13:36:01 +0900 Subject: [PATCH 4/5] Update build.gradle --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index bc40219..5df519b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,6 +33,7 @@ android { } } + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) testImplementation 'junit:junit:4.12' From eee0ac0b0d4edceb49eeb2034a718cdabbb1c8c3 Mon Sep 17 00:00:00 2001 From: "dinh.thuy.duong" Date: Mon, 7 Sep 2020 13:50:15 +0900 Subject: [PATCH 5/5] remove tast ApplicationTest --- .../datastorequickstart/ApplicationTest.java | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 app/src/androidTest/java/ncmbdataquick/mbaas/com/nifcloud/datastorequickstart/ApplicationTest.java diff --git a/app/src/androidTest/java/ncmbdataquick/mbaas/com/nifcloud/datastorequickstart/ApplicationTest.java b/app/src/androidTest/java/ncmbdataquick/mbaas/com/nifcloud/datastorequickstart/ApplicationTest.java deleted file mode 100644 index cf09760..0000000 --- a/app/src/androidTest/java/ncmbdataquick/mbaas/com/nifcloud/datastorequickstart/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package ncmbdataquick.mbaas.com.nifcloud.datastorequickstart; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file