Merge pull request #169 from bassaer/ci

support travis ci

.gitignore

@@ -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/
 

.travis.yml

@@ -0,0 +1,41 @@
+language: android
+
+env:
+  global:
+  - GRADLE_OPTS="-Xmx512m -XX:MaxPermSize=512m"
+  - ADB_INSTALL_TIMEOUT=10
+
+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

chatmessageview/build.gradle

@@ -11,6 +11,7 @@ def libVersion = properties.getProperty('version')
 android {
     compileSdkVersion 28
     buildToolsVersion '28.0.3'
+    testOptions.unitTests.includeAndroidResources = true
 
     defaultConfig {
         minSdkVersion 15
@@ -112,11 +113,13 @@ dependencies {
     implementation "androidx.core:core:1.0.1"
     implementation "androidx.appcompat:appcompat:1.0.2"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-
-    implementation 'de.hdodenhof:circleimageview:3.0.0'
-
-    testImplementation 'junit:junit:4.12'
+    implementation "de.hdodenhof:circleimageview:3.0.0"
+    implementation "com.android.support:appcompat-v7:28.0.0"
+    implementation "com.android.support:support-v4:28.0.0"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    testImplementation "junit:junit:4.12"
     testImplementation "org.robolectric:robolectric:4.1"
+    testImplementation "androidx.test:core:1.1.0"
     testImplementation "org.mockito:mockito-core:2.24.0"
 }
 
@@ -144,7 +147,7 @@ artifacts {
     archives sourcesJar
 }
 
-task findConventions << {
+task findConventions doLast {
     println project.getConvention()
 }
 

chatmessageview/src/main/kotlin/com/github/bassaer/chatmessageview/util/TimeUtils.kt

@@ -19,7 +19,7 @@ object TimeUtils {
      */
     @SuppressLint("SimpleDateFormat")
     fun calendarToString(calendar: Calendar, format: String?): String {
-        val sdf = SimpleDateFormat( format ?: "HH:mm")
+        val sdf = SimpleDateFormat( format ?: "HH:mm", Locale.ENGLISH)
         return sdf.format(calendar.time)
     }
 

chatmessageview/src/test/kotlin/com/github/bassaer/chatmessageview/util/DateFormatterTest.kt

@@ -16,7 +16,7 @@ internal class DateFormatterTest {
         val formatter = DateFormatter()
         val calendar = Calendar.getInstance()
         calendar.set(2017, 10, 12)
-        assertEquals(formatter.getFormattedTimeText(calendar), "Nov. 12, 2017")
+        assertEquals("Nov. 12, 2017", formatter.getFormattedTimeText(calendar))
     }
 
-}
+}

chatmessageview/src/test/kotlin/com/github/bassaer/chatmessageview/view/MessageAdapterTest.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import android.graphics.BitmapFactory
 import android.view.View
 import android.widget.TextView
-
+import androidx.test.core.app.ApplicationProvider
 import com.github.bassaer.chatmessageview.R
 import com.github.bassaer.chatmessageview.model.Attribute
 import com.github.bassaer.chatmessageview.model.ChatUser
@@ -16,7 +16,6 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.RuntimeEnvironment
 
 /**
  * MessageAdapter Unit Test
@@ -30,7 +29,7 @@ internal class MessageAdapterTest {
 
     @Before
     fun setUp() {
-        context = RuntimeEnvironment.application
+        context = ApplicationProvider.getApplicationContext()
         messageList = ArrayList()
         val senderIcon = BitmapFactory.decodeResource(context.resources, R.drawable.ic_account_circle)
         val receiverIcon = BitmapFactory.decodeResource(context.resources, R.drawable.ic_action_user)

example/build.gradle

@@ -35,19 +35,14 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':chatmessageview')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "androidx.appcompat:appcompat:1.0.2"
-    implementation 'com.google.code.gson:gson:2.8.5'
-
-    testImplementation 'junit:junit:4.12'
-
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.google.code.gson:gson:2.8.2'
     androidTestImplementation 'junit:junit:4.12'
     androidTestImplementation "androidx.test.espresso:espresso-core:3.1.1"
     androidTestImplementation "androidx.test.espresso:espresso-idling-resource:3.1.1"
     androidTestImplementation "androidx.test:rules:1.1.1"
     androidTestImplementation "androidx.test:runner:1.1.1"
     androidTestImplementation "androidx.test.ext:junit:1.1.0"
-
 }
 
 repositories {

gradle.properties

@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.enableUnitTestBinaryResources=true
+