hmalik144/EasyCC_Master
1
0
Fork 0
mirror of https://github.com/hmalik144/EasyCC_Master.git synced 2026-03-17 23:16:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	app/src/androidTest/java/com/appttude/h_mal/easycc/MainActivityTest.java
This commit is contained in:
hmalik144
2020-04-12 19:19:57 +01:00
parent 13da00e96a ffb6db4dfc
commit 9753312573
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

@@ -3,7 +3,7 @@ jobs:
build: build:
working_directory: ~/code working_directory: ~/code
docker: docker:
- image: circleci/android:api-26-alpha - image: circleci/android:api-27-alpha
environment: environment:
JVM_OPTS: -Xmx3200m JVM_OPTS: -Xmx3200m
steps: steps:
@@ -21,6 +21,8 @@ jobs:
- ~/.gradle - ~/.gradle
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}
- run: - run:
# name: Run UnitTest
# command: ./gradlew ExampleInstrumentedTest
name: Run Tests name: Run Tests
command: ./gradlew lint test command: ./gradlew lint test
- store_artifacts: # for display in Artifacts: https://circleci.com/docs/2.0/artifacts/ - store_artifacts: # for display in Artifacts: https://circleci.com/docs/2.0/artifacts/

2
app/src/main/java/com/appttude/h_mal/easycc/legacy/MainActivityJava.java
View File

@@ -375,4 +375,4 @@ public class MainActivityJava extends AppCompatActivity {
} }
} }