Skip to content

Commit aa27cf4

Browse files
committed
Update versions
1 parent 4a4afca commit aa27cf4

File tree

6 files changed

+13
-9
lines changed

6 files changed

+13
-9
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626

2727
dependencies {
2828
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
29-
implementation 'com.android.support:appcompat-v7:28.0.0'
29+
implementation 'androidx.appcompat:appcompat:1.0.0'
3030
implementation 'com.google.android.material:material:1.0.0'
3131
implementation 'com.github.bufferapp:CounterView:115e659a89'
3232
}
@@ -36,7 +36,7 @@ publish {
3636
userOrg = 'buffer'
3737
groupId = 'org.buffer.android'
3838
artifactId = 'android-components'
39-
publishVersion = '0.2'
39+
publishVersion = '0.3'
4040
desc = 'An Android library for frequently used UI components'
4141
website = 'https://github.com/bufferapp/android-components'
4242
}

app/src/main/java/org/buffer/android/components/RoundedButton.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package org.buffer.android.components
33
import android.buffer.org.ui_kit.R
44
import android.content.Context
55
import android.graphics.Typeface
6-
import android.support.v4.content.ContextCompat
7-
import android.support.v7.widget.AppCompatButton
6+
import androidx.core.content.ContextCompat
7+
import androidx.appcompat.widget.AppCompatButton
88
import android.util.AttributeSet
99
import android.view.Gravity.CENTER
1010

app/src/main/res/values/colors.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
<color name="green_darker">#364E0D</color>
6969

7070
<color name="text_primary">@color/gray_darker</color>
71+
<color name="text_secondary">@color/gray_dark</color>
7172
<color name="text_disabled">@color/gray_dark</color>
7273
<color name="text_placeholder">@color/gray</color>
7374
<color name="text_notice">@color/red_dark</color>

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.61'
4+
ext.kotlin_version = '1.3.41'
55
repositories {
66
google()
77
maven { url 'https://maven.fabric.io/public' }
8-
maven { url 'https://plugins.gradle.org/m2/' }
8+
maven { url 'https://plugins.gradle.org/m2/' }
99
mavenCentral()
1010
jcenter()
1111
}
1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:3.2.0'
13+
classpath 'com.android.tools.build:gradle:3.5.1'
1414
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1515
classpath 'com.novoda:bintray-release:0.9.1'
1616

@@ -23,7 +23,7 @@ allprojects {
2323
repositories {
2424
mavenCentral()
2525
maven { url "https://maven.google.com" }
26-
maven { url "https://dl.bintray.com/buffer/Maven" }
26+
maven { url "https://dl.bintray.com/buffer/Maven" }
2727
maven { url 'https://jitpack.io' }
2828
google()
2929
jcenter()

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
# http://www.gradle.org/docs/current/userguide/build_environment.html
77
# Specifies the JVM arguments used for the daemon process.
88
# The setting is particularly useful for tweaking memory settings.
9+
android.enableJetifier=true
10+
android.useAndroidX=true
911
org.gradle.jvmargs=-Xmx1536m
1012
# When configured, Gradle will run in incubating parallel mode.
1113
# This option should only be used with decoupled projects. More details, visit
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Fri Nov 15 14:51:08 CST 2019
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

0 commit comments

Comments
 (0)