Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
zsmb13 committed Oct 8, 2018
2 parents c39d171 + c9b66c3 commit 9e1dba6
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ library release build:
tags:
- docker
script:
- ./gradlew clean library:assembleRelease androidSourcesJar androidJavadocsJar
- ./gradlew clean library:assembleRelease androidSourcesJar
artifacts:
paths:
- library/build*
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:
global:
- ANDROID_API=28
- EMULATOR_API=21
- ANDROID_BUILD_TOOLS=28.0.2
- ANDROID_BUILD_TOOLS=28.0.3
- ADB_INSTALL_TIMEOUT=10 # minutes

android:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ You can find the sample app [in the Play Store](https://play.google.com/store/ap
The library is hosted on jcenter. To use it, add the following to your module level `build.gradle` file's dependencies:

```gradle
implementation 'co.zsmb:materialdrawer-kt:2.0.0'
implementation 'co.zsmb:materialdrawer-kt:2.0.1'
//required support lib modules
implementation "androidx.appcompat:appcompat:${versions.androidX}"
Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ apply from: '../testformatter.gradle'

android {
compileSdkVersion 28
buildToolsVersion '28.0.2'
buildToolsVersion '28.0.3'
defaultConfig {
applicationId "co.zsmb.materialdrawerktexample"
minSdkVersion 14
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
buildscript {
ext.kotlin_version = '1.2.70'
ext.kotlin_version = '1.2.71'
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0-rc03'
classpath 'com.android.tools.build:gradle:3.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
Expand Down
4 changes: 2 additions & 2 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ apply plugin: "com.jfrog.bintray"
ext {
PUBLISH_GROUP_ID = 'co.zsmb'
PUBLISH_ARTIFACT_ID = 'materialdrawer-kt'
PUBLISH_VERSION = '2.0.0'
PUBLISH_VERSION = '2.0.1'
}

android {
Expand All @@ -27,7 +27,7 @@ android {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

api 'com.mikepenz:materialdrawer:6.1.0'
api 'com.mikepenz:materialdrawer:6.1.1'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'androidx.annotation:annotation:1.0.0'
Expand Down

0 comments on commit 9e1dba6

Please sign in to comment.