Skip to content

Commit

Permalink
Merge pull request #170 from bassaer/develop
Browse files Browse the repository at this point in the history
v2.0.0
  • Loading branch information
bassaer authored Feb 24, 2019
2 parents 03e74b3 + 3b1caed commit 864c6fc
Show file tree
Hide file tree
Showing 47 changed files with 596 additions and 403 deletions.
94 changes: 0 additions & 94 deletions .circleci/config.yml

This file was deleted.

25 changes: 19 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,29 @@ captures/

# Intellij
*.iml

.idea/caches/
.idea/libraries/
.idea/shelf/
.idea/workspace.xml
.idea/tasks.xml
.idea/libraries
.idea/vcs.xml
.idea/.name
.idea/compiler.xml
.idea/copyright/profiles_settings.xml
.idea/encodings.xml
.idea/misc.xml
.idea/modules.xml
.idea/markdown-navigator/
.idea/markdown-navigator.xml
.idea/codeStyleSettings.xml
.idea/markdown-exported-files.xml
.idea/scopes/scope_settings.xml
.idea/dictionaries
.idea/vcs.xml
.idea/jsLibraryMappings.xml
.idea/datasources.xml
.idea/dataSources.ids
.idea/sqlDataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml
.idea/assetWizardSettings.xml
.idea/codeStyles/*

projectFilesBackup/

Expand Down
1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

22 changes: 0 additions & 22 deletions .idea/compiler.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/copyright/profiles_settings.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/dictionaries/nakayama.xml

This file was deleted.

20 changes: 0 additions & 20 deletions .idea/gradle.xml

This file was deleted.

42 changes: 42 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
language: android
env:
global:
- GRADLE_OPTS="-Xmx512m -XX:MaxPermSize=512m"
- ADB_INSTALL_TIMEOUT=10
- secure: "RdQNUckTM43ea1vGjp5umCeL0RMNglTdeB2CQ8iNsATBAMTppvUKS0j7EAaYidO4lfTrLvsMyO/ujbMkBgFmPXCYJUkDi0OUiCkdXQzVYoMrrfY4PIw2LKcm9YhCZ5NJpAdXV56CyiYX67ZzlsR2Jm1y1toEnfSK1u1tQkZxq4qdm+KPIoYhIbSu0RChZs4aBB4Eyt7/Juix094G+mUeRqrmt3FkCwhA450euNTy5NtLCkJe/SLPtKK4lzcc15VoFrMNZ55FJ2qjekiucyrl+6fjbxHP8dFQ8Wa54/iJJKcyH0BLevpA0kYyTzNoD6YBspo3lIGrI+szL6rQSruYqPu49xpjhVb0nTner8Usybj81ILQzkwZ/leEFCZRxlEzHtqYRfmqi4QzxmBtTVF47HK29CQDOhghC1SolOzepulFDAnK6g07dLvhdPt+P0jQba694h8onCLbiamLPtz1+75ZJaG+RNOo+hP8hJ80Wkww95Aa3KR3Gnh4Kapqnf7TF7A/MJPCqktYadZuCpVAX10VWjwyB0B0lcTEsP8S1pl+w1J//nOIjBpb7o3szFnoV3CZzAkHoKAX1ah5uNDYxWPBI/ViVJgzKHdQss/gICwMu4uAkseXsswTvOVdlAqB5laG2rL6ZuqiyZGCFTTtzsggPwFfs2tY+WR0gABbgPE="
- secure: "OdKFtIaKIlwb5kl5JjasYciuj14+z2qPbCsHPRWdm/QB40tQZnIEWfwrypW3HHxfxzlAJxnKGuv66Y90FLBEL5WvG8r9gxPYcheMNv+AzpXhB4Pzbg8T2k5pJAI4OBTi+yMQkLMnz1Q8YOe7boiNcSC5oCdlQCLADOmu/Wxl9GVpDgEUZX/+4jLQvn/yo58Xxk2ANA56HNt6/ww+yNVdELe9X3bazW9pl7nvBLP5KcyibGYw1pMe3N3W74r6xw21x8ifYUTeeEz1WKwCammJluRXkR7al1o0EZwuS1hA7AbeJAsY5XwNJEUDMYQgrSXif6ie3h9zJYIFi0b8o3f/7KkPXoxCtWvR9s24fmsjlc+ogDw2/0CfGBe6gBlIqItJ6W83+Synk8k2xrkp3brf7nl0e9Flg8ZHL4fFDAexUhwkOGApN0IA8Y2uZCMK2FSB8dkO2hR4goF8sOec1JmkX0KVf+m+Gm7RYXrR1cOoRSKxdjwyc1Py+b069nqANmHSHudw/54L7fiO8AVe9goXCYP3+u74kfgErgBICFZMS8DxIYZa3TZYkJfV1GEMgt1DiOPwhprQmjeoXxCzdln8u6mMYBqvY486f2w2MDenH2AsJMbR77K/TGZGuzhK7ZPKXEiahvYbPI1LyDRhwcDdfR8ZDod4nvx39uPVmIqJHMA="
android:
components:
- build-tools-28.0.3
- android-28
- android-22
- extra-google-m2repository
- extra-android-m2repository
- addon-google_apis-google-28
- sys-img-armeabi-v7a-android-22
licenses:
- android-sdk-preview-license-.+
- android-sdk-license-.+
- google-gdk-license-.+
branches:
only:
- master
before_install:
- yes | sdkmanager "platforms;android-28"
- mkdir "$ANDROID_HOME/licenses" || true
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
before_script:
- echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
- QEMU_AUDIO_DRV=none emulator -avd test -no-audio -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82 &
script:
- ./gradlew clean lint test :example:connectedAndroidTest
deploy:
provider: script
script: scripts/deploy.sh
skip_cleanup: true
after_deploy:
- set -e
- scripts/bump.sh
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# CHANGELOG

Ver 2.0.0
- PR: https://github.com/bassaer/ChatMessageView/pull/170
- update lib version
- migrate AndroidX
- CircleCI -> TravisCI
- change LICENSE
Loading

0 comments on commit 864c6fc

Please sign in to comment.