Update dependencies and fix bad rebase

robinhood · Apr 19, 2018 · 4c6b6cb · 4c6b6cb
1 parent 65fcb60
commit 4c6b6cb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.1.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/ticker-sample/build.gradle b/ticker-sample/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '26.0.2'
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         applicationId "com.robinhood.ticker.sample"
@@ -14,6 +14,6 @@ android {
 dependencies {
     implementation project(':ticker')
 
-    implementation 'com.android.support:appcompat-v7:27.0.2'
-    implementation 'com.android.support:recyclerview-v7:27.0.2'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
 }
diff --git a/ticker/build.gradle b/ticker/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
 
     resourcePrefix 'ticker_'
 
     defaultConfig {
         minSdkVersion 12
-        targetSdkVersion 26
+        targetSdkVersion 27
     }
 }
 

diff --git a/ticker/src/main/java/com/robinhood/ticker/TickerColumnManager.java b/ticker/src/main/java/com/robinhood/ticker/TickerColumnManager.java
@@ -59,7 +59,7 @@ void setCharacterLists(String... characterLists) {
         }
     }
 
-    List<char[]> getCharacterLists() {
+    TickerCharacterList[] getCharacterLists() {
         return characterLists;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,7 +59,7 @@ void setCharacterLists(String... characterLists) { @@
             }
         }
-        List<char[]> getCharacterLists() {
+        TickerCharacterList[] getCharacterLists() {
             return characterLists;
         }
@@ Expand Down @@