Skip to content

Commit e1a38a1

Browse files
committed
Upgrade dependencies versions
1 parent 180d5df commit e1a38a1

File tree

3 files changed

+7
-18
lines changed

3 files changed

+7
-18
lines changed

build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
final homePath = System.properties['user.home']
2626

2727
buildscript {
28-
ext.kotlin_version = '1.2.21'
28+
ext.kotlin_version = '1.2.30'
2929
repositories {
3030
jcenter()
3131
mavenCentral()
@@ -34,7 +34,6 @@ buildscript {
3434
dependencies {
3535
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
3636
classpath 'com.android.tools.build:gradle:3.2.0-alpha04'
37-
// classpath 'com.dicedmelon.gradle:jacoco-android:0.1.2'
3837
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
3938
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
4039
classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
@@ -54,7 +53,7 @@ allprojects {
5453
maven {
5554
url 'https://maven.google.com'
5655
}
57-
//To activate temporarily, when waiting for Bintray to approve packages to be approved in JCenter
56+
//To activate temporarily, when waiting for Bintray to approve packages submitted to JCenter
5857
// maven { url 'https://dl.bintray.com/rm3l/maven'}
5958
}
6059
}

maoni-common/build.gradle

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,6 @@ version = '5.0.0'
3232

3333
final homePath = System.properties['user.home']
3434

35-
///*
36-
// * This is to mark some artifacts (such as Android's) as provided
37-
// * so that we don't get dependency conflicts
38-
// */
39-
//configurations {
40-
// provided
41-
// compile.extendsFrom provided
42-
// implementation.extendsFrom provided
43-
//}
44-
4535
dependencies {
4636
implementation fileTree(dir: 'libs', include: ['*.jar'])
4737
compileOnly ('com.google.android:android:4.1.1.4') {

maoni-sample/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ android {
161161
buildConfigField "String", "SLACK_EMOJI_ICON", "\"${slackEmojiIcon}\""
162162

163163
zipAlignEnabled true
164+
signingConfig signingConfigs.debug
164165
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
165166
}
166167
}
@@ -209,18 +210,17 @@ dependencies {
209210
implementation 'com.android.support:appcompat-v7:27.1.0'
210211
implementation 'com.android.support:cardview-v7:27.1.0'
211212
implementation 'com.facebook.stetho:stetho:1.5.0'
212-
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.1'
213-
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
214-
testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
215-
implementation('com.mikepenz:aboutlibraries:6.0.2@aar') {
213+
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
214+
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
215+
implementation('com.mikepenz:aboutlibraries:6.0.6@aar') {
216216
transitive = true
217217
}
218218
}
219219

220220
play {
221221
// ...
222222
track = 'beta'
223-
untrackOld = true // will untrack 'alpha' while upload to 'beta'
223+
untrackOld = true // will un-track 'alpha' while upload to 'beta'
224224

225225
uploadImages = false
226226
errorOnSizeLimit = false

0 commit comments

Comments
 (0)