From b5689708ec985d1820322309d548cfa1f3d41dec Mon Sep 17 00:00:00 2001 From: Hk-tang Date: Fri, 11 Oct 2019 11:27:26 -0600 Subject: [PATCH 01/22] Lab code --- app/build.gradle | 63 ++++++++------- .../listycity/ExampleInstrumentedTest.java | 55 ++++++------- .../example/simpleparadox/listycity/City.java | 51 +++++++----- .../simpleparadox/listycity/CityList.java | 80 +++++++++++++++++++ .../simpleparadox/listycity/CityListTest.java | 73 +++++++++++++++++ .../listycity/ExampleUnitTest.java | 32 ++++---- 6 files changed, 263 insertions(+), 91 deletions(-) create mode 100644 app/src/main/java/com/example/simpleparadox/listycity/CityList.java create mode 100644 app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java diff --git a/app/build.gradle b/app/build.gradle index 0d17b9380..463b9b6de 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,29 +1,34 @@ -apply plugin: 'com.android.application' - -android { - compileSdkVersion 29 - buildToolsVersion "29.0.2" - defaultConfig { - applicationId "com.example.simpleparadox.listycity" - minSdkVersion 15 - targetSdkVersion 29 - versionCode 1 - versionName "1.0" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.0.2' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} +apply plugin: 'com.android.application' + +android { + compileSdkVersion 29 + buildToolsVersion "29.0.2" + defaultConfig { + applicationId "com.example.simpleparadox.listycity" + minSdkVersion 15 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.0.1' +} diff --git a/app/src/androidTest/java/com/example/simpleparadox/listycity/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/simpleparadox/listycity/ExampleInstrumentedTest.java index 14b60b236..47bd794f4 100644 --- a/app/src/androidTest/java/com/example/simpleparadox/listycity/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/example/simpleparadox/listycity/ExampleInstrumentedTest.java @@ -1,27 +1,28 @@ -package com.example.simpleparadox.listycity; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals("com.example.simpleparadox.listycity", appContext.getPackageName()); - } -} +package com.example.simpleparadox.listycity; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + + assertEquals("com.example.simpleparadox.listycity", appContext.getPackageName()); + } +} diff --git a/app/src/main/java/com/example/simpleparadox/listycity/City.java b/app/src/main/java/com/example/simpleparadox/listycity/City.java index fb6fbd1d1..b43ff2a7e 100644 --- a/app/src/main/java/com/example/simpleparadox/listycity/City.java +++ b/app/src/main/java/com/example/simpleparadox/listycity/City.java @@ -1,19 +1,32 @@ -package com.example.simpleparadox.listycity; - -public class City { - private String city; - private String province; - - City(String city, String province){ - this.city = city; - this.province = province; - } - - String getCityName(){ - return this.city; - } - - String getProvinceName(){ - return this.province; - } -} +package com.example.simpleparadox.listycity; + +public class City implements Comparable{ + private String city; + private String province; + + City(String city, String province){ + this.city = city; + this.province = province; + } + + String getCityName(){ + return this.city; + } + + String getProvinceName(){ + return this.province; + } + + @Override + public int compareTo(City o) { + int cityCompare = city.compareTo(o.getCityName()); + int provinceCompare = province.compareTo(o.getProvinceName()); + + if (cityCompare > 0 || provinceCompare > 0) + return 1; + else if (cityCompare == 0 && provinceCompare == 0) + return 0; + else + return -1; + } +} diff --git a/app/src/main/java/com/example/simpleparadox/listycity/CityList.java b/app/src/main/java/com/example/simpleparadox/listycity/CityList.java new file mode 100644 index 000000000..6da242f3e --- /dev/null +++ b/app/src/main/java/com/example/simpleparadox/listycity/CityList.java @@ -0,0 +1,80 @@ +package com.example.simpleparadox.listycity; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * This is a class that keeps track of a list of city objects + */ +public class CityList { + private List cities = new ArrayList<>(); + + /** + * This adds a city to the list if the city does not exist + * @param city + * This is a candidate city to add + */ + public void add(City city) { + if (hasCity(city)) { + throw new IllegalArgumentException(); + } + cities.add(city); + } + + /** + * This returns a sorted list of cities + * @return + * Return the sorted list + */ + public List getCities() { + List list = cities; + Collections.sort(list); + return list; + } + + /** + * This method checks to see if a city already exists in the list + * @param city + * City to check + * @return + * Return true if the city exists already + */ + public boolean hasCity(City city) { + for (City c : cities) { + if (c.getCityName().equals(city.getCityName()) && + c.getProvinceName().equals(city.getProvinceName())) { + return true; + } + } + + return false; + } + + /** + * Delete the city from the list if it is there + * @param city + * Candidate city to delete + */ + public void delete(City city) { + if (!hasCity(city)) { + throw new IllegalArgumentException(); + } + + for (City c : cities) { + if (c.compareTo(city) == 0){ + cities.remove(c); + break; + } + } + } + + /** + * Return the size of the city list + * @return + * Size of city list + */ + public int countCities() { + return cities.size(); + } +} diff --git a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java new file mode 100644 index 000000000..b43aef7d2 --- /dev/null +++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java @@ -0,0 +1,73 @@ +package com.example.simpleparadox.listycity; + +import org.junit.jupiter.api.Test; + + +import static org.junit.jupiter.api.Assertions.*; + +class CityListTest { + + private CityList mockCityList() { + CityList cityList = new CityList(); + cityList.add(mockCity()); + return cityList; + } + + private City mockCity() { + return new City("Edmonton", "Alberta"); + } + + @Test + void testAdd() { + CityList cityList = mockCityList(); + + assertEquals(1, cityList.countCities()); + + cityList.add(new City("Regina", "Saskatchewan")); + + assertEquals(2, cityList.countCities()); + assertTrue(cityList.hasCity(new City("Regina", "Saskatchewan"))); + } + + @Test + void testHasCity() { + CityList cityList = mockCityList(); + + assertTrue(cityList.hasCity(mockCity())); + } + + @Test + void testGetCities() { + CityList cityList = mockCityList(); + + assertEquals(0, mockCity().compareTo(cityList.getCities().get(0))); + + City city = new City("Charlottetown", "Prince Edward Island"); + cityList.add(city); + + assertEquals(0, city.compareTo(cityList.getCities().get(0))); + assertEquals(0, mockCity().compareTo(cityList.getCities().get(1))); + } + + @Test + void testDeleteCity() { + CityList cityList = mockCityList(); + + City city = new City("Victoria", "British Columbia"); + cityList.add(city); + + assertEquals(2, cityList.countCities()); + + cityList.delete(mockCity()); + + assertEquals(1, cityList.countCities()); + assertEquals(0, city.compareTo(cityList.getCities().get(0))); + } + + @Test + void testCountCities() { + CityList cityList = mockCityList(); + + assertEquals(1, cityList.countCities()); + } +} \ No newline at end of file diff --git a/app/src/test/java/com/example/simpleparadox/listycity/ExampleUnitTest.java b/app/src/test/java/com/example/simpleparadox/listycity/ExampleUnitTest.java index b5f0d24f0..6b2be547f 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/ExampleUnitTest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/ExampleUnitTest.java @@ -1,17 +1,17 @@ -package com.example.simpleparadox.listycity; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } +package com.example.simpleparadox.listycity; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } } \ No newline at end of file From 5bdb425c29c120a0aec9ad96eeed271bb55e4f1c Mon Sep 17 00:00:00 2001 From: Hk-tang Date: Fri, 11 Oct 2019 11:34:08 -0600 Subject: [PATCH 02/22] Reverted compareto for simplicity --- .../java/com/example/simpleparadox/listycity/City.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app/src/main/java/com/example/simpleparadox/listycity/City.java b/app/src/main/java/com/example/simpleparadox/listycity/City.java index b43ff2a7e..ad43a057c 100644 --- a/app/src/main/java/com/example/simpleparadox/listycity/City.java +++ b/app/src/main/java/com/example/simpleparadox/listycity/City.java @@ -19,14 +19,6 @@ String getProvinceName(){ @Override public int compareTo(City o) { - int cityCompare = city.compareTo(o.getCityName()); - int provinceCompare = province.compareTo(o.getProvinceName()); - - if (cityCompare > 0 || provinceCompare > 0) - return 1; - else if (cityCompare == 0 && provinceCompare == 0) - return 0; - else - return -1; + return city.compareTo(o.getCityName()); } } From ba5d16082f85d21bed13faeed05b3bcd579fba3f Mon Sep 17 00:00:00 2001 From: Hk-tang Date: Sat, 12 Oct 2019 10:26:38 -0600 Subject: [PATCH 03/22] Added Exception testing --- .../simpleparadox/listycity/CityListTest.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java index b43aef7d2..787eab7e0 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java @@ -29,6 +29,18 @@ void testAdd() { assertTrue(cityList.hasCity(new City("Regina", "Saskatchewan"))); } + @Test + void testAddException() { + CityList cityList = mockCityList(); + + City city = new City("Yellowknife", "Northwest Territories"); + cityList.add(city); + + assertThrows(IllegalArgumentException.class, () -> { + cityList.add(city); + }); + } + @Test void testHasCity() { CityList cityList = mockCityList(); @@ -64,6 +76,17 @@ void testDeleteCity() { assertEquals(0, city.compareTo(cityList.getCities().get(0))); } + @Test + void testDeleteException() { + CityList cityList = mockCityList(); + + cityList.delete(mockCity()); + + assertThrows(IllegalArgumentException.class, () -> { + cityList.delete(mockCity()); + }); + } + @Test void testCountCities() { CityList cityList = mockCityList(); From 5ae50f235854eba497ff024fd9fcf49bc68d323f Mon Sep 17 00:00:00 2001 From: Henry Tang Date: Tue, 15 Oct 2019 15:19:34 -0600 Subject: [PATCH 04/22] Updated the dependencies --- app/build.gradle | 2 +- .../com/example/simpleparadox/listycity/ExampleUnitTest.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 463b9b6de..847098177 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,8 +27,8 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.0.2' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test:runner:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.0.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1' } diff --git a/app/src/test/java/com/example/simpleparadox/listycity/ExampleUnitTest.java b/app/src/test/java/com/example/simpleparadox/listycity/ExampleUnitTest.java index 6b2be547f..edca88651 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/ExampleUnitTest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/ExampleUnitTest.java @@ -1,8 +1,9 @@ package com.example.simpleparadox.listycity; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Example local unit test, which will execute on the development machine (host). From 588a8e800a2bc5f2ac604d6b3dc0ab414aed12dd Mon Sep 17 00:00:00 2001 From: Rohan Saha Date: Fri, 25 Oct 2019 10:49:16 -0600 Subject: [PATCH 05/22] Create travis.yml --- travis.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 travis.yml diff --git a/travis.yml b/travis.yml new file mode 100644 index 000000000..4e2b6166f --- /dev/null +++ b/travis.yml @@ -0,0 +1,24 @@ +language: android +dist: trusty +android: + components: + # Uncomment the lines below if you want to + # use the latest revision of Android SDK Tools + # - tools + # - platform-tools + + # The BuildTools version used by your project + - build-tools-29.0.2 + + # The SDK version used to compile your project + - android-29 + + # Additional components + - extra-google-google_play_services + - extra-google-m2repository + - extra-android-m2repository + + # Specify at least one system image, + # if you need to run emulator(s) during your tests + - sys-img-x86-android-26 + - sys-img-armeabi-v7a-android-17 From 5e94c8d8cd9ef2f5d81ede9b2704cbf57a2ab4d4 Mon Sep 17 00:00:00 2001 From: Rohan Saha Date: Fri, 25 Oct 2019 11:04:56 -0600 Subject: [PATCH 06/22] Update travis.yml --- travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/travis.yml b/travis.yml index 4e2b6166f..ddf33892b 100644 --- a/travis.yml +++ b/travis.yml @@ -22,3 +22,7 @@ android: # if you need to run emulator(s) during your tests - sys-img-x86-android-26 - sys-img-armeabi-v7a-android-17 +branches: + only: + - A + - master From b53f0a0d2666873da9af744145fef43fb82ca812 Mon Sep 17 00:00:00 2001 From: Rohan Saha Date: Fri, 25 Oct 2019 11:12:33 -0600 Subject: [PATCH 07/22] Update travis.yml --- travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/travis.yml b/travis.yml index ddf33892b..5a3f22848 100644 --- a/travis.yml +++ b/travis.yml @@ -24,5 +24,4 @@ android: - sys-img-armeabi-v7a-android-17 branches: only: - - A - - master + - travis_ci From 8c9074d10071fea0f62df3e3ef0098d2a81d4491 Mon Sep 17 00:00:00 2001 From: Rohan Saha Date: Fri, 25 Oct 2019 11:15:31 -0600 Subject: [PATCH 08/22] Rename travis.yml to .travis.yml --- travis.yml => .travis.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename travis.yml => .travis.yml (100%) diff --git a/travis.yml b/.travis.yml similarity index 100% rename from travis.yml rename to .travis.yml From 7c09aab17d4a61c9b6d4e30f1113bf382a5e3273 Mon Sep 17 00:00:00 2001 From: Rohan Saha Date: Fri, 25 Oct 2019 11:19:46 -0600 Subject: [PATCH 09/22] Give permissions to Travis --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5a3f22848..9b710de53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,8 @@ android: # The SDK version used to compile your project - android-29 - +before_install: + - chmod +x gradlew # Additional components - extra-google-google_play_services - extra-google-m2repository From fcb81f48b1f5558008fd3342a3a73e8fa051e3c0 Mon Sep 17 00:00:00 2001 From: Rohan Saha Date: Fri, 25 Oct 2019 11:23:47 -0600 Subject: [PATCH 10/22] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b710de53..3c995011b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,6 @@ android: # The SDK version used to compile your project - android-29 -before_install: - - chmod +x gradlew # Additional components - extra-google-google_play_services - extra-google-m2repository @@ -26,3 +24,5 @@ before_install: branches: only: - travis_ci +before_install: + - chmod +x gradlew From 590c31725cf8ac813ed896ecdac8e442a1bf99fa Mon Sep 17 00:00:00 2001 From: simpleParadox Date: Fri, 25 Oct 2019 11:35:12 -0600 Subject: [PATCH 11/22] Permssion access for travis --- gradlew | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 From 4d7db180ae9d614e294228857843f6012e553ac7 Mon Sep 17 00:00:00 2001 From: Rohan Saha Date: Fri, 25 Oct 2019 12:05:04 -0600 Subject: [PATCH 12/22] Update .travis.yml --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3c995011b..ff9dab975 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,3 +26,9 @@ branches: - travis_ci before_install: - chmod +x gradlew +before_install: + - wget http://services.gradle.org/distributions/gradle-5.3-bin.zip + - unzip -qq gradle-5.3-bin.zip + - export GRADLE_HOME=$PWD/gradle-5.3 + - export PATH=$GRADLE_HOME/bin:$PATH + - gradle -v From f38e098b090433d19569b65f285b8aae6f04a9d5 Mon Sep 17 00:00:00 2001 From: Rohan Saha Date: Fri, 25 Oct 2019 12:22:41 -0600 Subject: [PATCH 13/22] Change gradle version. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5509623ab..2981a3e44 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:6.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From 1576675db3927ddc35e16c5704fbf83f4e28c633 Mon Sep 17 00:00:00 2001 From: simpleParadox Date: Fri, 25 Oct 2019 15:24:11 -0600 Subject: [PATCH 14/22] Update Gradle version --- .idea/codeStyles/Project.xml | 116 +++++++++++++++++++++++++++++++++++ .idea/gradle.xml | 16 +++++ .idea/runConfigurations.xml | 12 ++++ build.gradle | 2 +- 4 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/runConfigurations.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 000000000..681f41ae2 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 000000000..d291b3d7c --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 000000000..7f68460d8 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 5509623ab..aec661f68 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.5.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From 1853c4a8d25bf1d141040c560ae04f36191ef1aa Mon Sep 17 00:00:00 2001 From: Rohan Saha Date: Sat, 26 Oct 2019 16:15:46 -0600 Subject: [PATCH 15/22] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff9dab975..273c12155 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,8 +25,7 @@ branches: only: - travis_ci before_install: - - chmod +x gradlew -before_install: + - chmod +x gradlew - wget http://services.gradle.org/distributions/gradle-5.3-bin.zip - unzip -qq gradle-5.3-bin.zip - export GRADLE_HOME=$PWD/gradle-5.3 From 8c08850e0e3d129f49a554708aec2a306a25bef3 Mon Sep 17 00:00:00 2001 From: Rohan Saha Date: Sat, 26 Oct 2019 16:25:52 -0600 Subject: [PATCH 16/22] Update .travis.yml --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 273c12155..42c23db36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,3 +31,7 @@ before_install: - export GRADLE_HOME=$PWD/gradle-5.3 - export PATH=$GRADLE_HOME/bin:$PATH - gradle -v + - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a -c 100M + - emulator -avd test -no-audio -no-window & + - android-wait-for-emulator + - adb shell input keyevent 82 & From 21ae660971eff42fd83705468c7dc2fd225aeefc Mon Sep 17 00:00:00 2001 From: Rohan Saha Date: Sat, 26 Oct 2019 16:32:28 -0600 Subject: [PATCH 17/22] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 42c23db36..3b0030e1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ before_install: - export GRADLE_HOME=$PWD/gradle-5.3 - export PATH=$GRADLE_HOME/bin:$PATH - gradle -v - - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a -c 100M + - echo no | android create avd --force -n test -t android-29 --abi armeabi-v7a -c 100M - emulator -avd test -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & From 498fb06f033dd6df6d95c2fd0ac44bcb2108c860 Mon Sep 17 00:00:00 2001 From: Rohan Saha Date: Sat, 26 Oct 2019 16:41:28 -0600 Subject: [PATCH 18/22] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3b0030e1d..2ceda009b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,7 @@ android: # Specify at least one system image, # if you need to run emulator(s) during your tests - - sys-img-x86-android-26 - - sys-img-armeabi-v7a-android-17 + - sys-img-armeabi-v7a-android-29 branches: only: - travis_ci From fd3911c795e22c7a85a99890ebfca102533320ed Mon Sep 17 00:00:00 2001 From: Kirby Banman Date: Sat, 26 Oct 2019 16:57:45 -0600 Subject: [PATCH 19/22] Mirror the travis config from github.com/codecov/example-android https://github.com/codecov/example-android/blob/master/.travis.yml --- .travis.yml | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ceda009b..3cd08bf35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,36 +1,56 @@ language: android -dist: trusty +jdk: oraclejdk8 +env: + global: + - ANDROID_TARGET=android-22 + - ANDROID_ABI=armeabi-v7a android: components: # Uncomment the lines below if you want to # use the latest revision of Android SDK Tools - # - tools - # - platform-tools + - tools + - platform-tools # The BuildTools version used by your project - - build-tools-29.0.2 + - build-tools-23.0.3 # The SDK version used to compile your project - - android-29 + # TODO: why is this here explicitly in addition to $ANDROID_TARGET below + - android-23 + # Additional components - extra-google-google_play_services - extra-google-m2repository - extra-android-m2repository + + # The SDK version used to compile your project + - $ANDROID_TARGET # Specify at least one system image, - # if you need to run emulator(s) during your tests - - sys-img-armeabi-v7a-android-29 + # if you need to run emulator(s) during your tests. + # The line should look like this after interpolation: + # - sys-img-armeabi-v7a-android-22 + - sys-img-${ANDROID_ABI}-${ANDROID_TARGET} branches: only: - travis_ci + - more_travis_ci before_install: + # Get gradle - chmod +x gradlew - wget http://services.gradle.org/distributions/gradle-5.3-bin.zip - unzip -qq gradle-5.3-bin.zip - export GRADLE_HOME=$PWD/gradle-5.3 - export PATH=$GRADLE_HOME/bin:$PATH + + # Build the project - gradle -v - - echo no | android create avd --force -n test -t android-29 --abi armeabi-v7a -c 100M - - emulator -avd test -no-audio -no-window & + + # Start the emulator + - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI + - emulator -avd test -no-skin -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & + + # The app will now automatically be installed and tested via + # the command `gradle connectedCheck` From bcb073c2d96f0f953bada5821f3e65efa36f05f7 Mon Sep 17 00:00:00 2001 From: Kirby Banman Date: Sat, 26 Oct 2019 17:12:48 -0600 Subject: [PATCH 20/22] accept licenses on travis --- .travis.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3cd08bf35..912ea31ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,11 @@ language: android jdk: oraclejdk8 + env: global: - ANDROID_TARGET=android-22 - ANDROID_ABI=armeabi-v7a + android: components: # Uncomment the lines below if you want to @@ -31,11 +33,14 @@ android: # The line should look like this after interpolation: # - sys-img-armeabi-v7a-android-22 - sys-img-${ANDROID_ABI}-${ANDROID_TARGET} -branches: - only: - - travis_ci - - more_travis_ci + +licenses: + - 'android-sdk-license-.+' + before_install: + # Accept sdk licenses + - yes | sdkmanager "platforms;$ANDROID_TARGET" + # Get gradle - chmod +x gradlew - wget http://services.gradle.org/distributions/gradle-5.3-bin.zip @@ -54,3 +59,9 @@ before_install: # The app will now automatically be installed and tested via # the command `gradle connectedCheck` + + +branches: + only: + - travis_ci + - more_travis_ci From b642a31eb3d8cbfcf853a0ae53b643131c97e5b5 Mon Sep 17 00:00:00 2001 From: Kirby Banman Date: Sat, 26 Oct 2019 17:29:51 -0600 Subject: [PATCH 21/22] try to accept android 29 license. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 912ea31ff..f5506f30b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ licenses: before_install: # Accept sdk licenses - - yes | sdkmanager "platforms;$ANDROID_TARGET" + - yes | sdkmanager "platforms;android-29" # Get gradle - chmod +x gradlew From a787365aa82b1ad7c027febea3f6b0fe7056f28d Mon Sep 17 00:00:00 2001 From: Kirby Banman Date: Sat, 26 Oct 2019 18:01:47 -0600 Subject: [PATCH 22/22] Update .travis.yml --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f5506f30b..e52c153ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,9 +59,3 @@ before_install: # The app will now automatically be installed and tested via # the command `gradle connectedCheck` - - -branches: - only: - - travis_ci - - more_travis_ci