Skip to content

Commit 7b808cb

Browse files
committed
Updated gradle and Android gradle plugin
1 parent 1162f1b commit 7b808cb

File tree

6 files changed

+10
-50
lines changed

6 files changed

+10
-50
lines changed

.idea/codeStyles/Project.xml

Lines changed: 1 addition & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# Change Log
22

3-
## next release
3+
## 3.0.0
44
- fixed #92: Migrate to AndroidX
55
- fixed #100: Use unique view IDs
66
- fixed #109: Added resource ID for main FAB
7+
- updated gradle and Android gradle plugin
78

89
## [2.0.1] - 2018-09-28
910
- fixed #95: support 28 workaround does not work on minified release apk

dependencies.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
ext.deps = [:]
2222
def versions = [:]
2323
versions.android_checkstyle_plugin = "1.1.0"
24-
versions.android_gradle_plugin = "3.3.2"
24+
versions.android_gradle_plugin = "3.4.2"
2525
versions.android_maven_gradle_plugin = "2.1"
2626
versions.android_material = "1.0.0"
2727
versions.androidx_appcompat = "1.0.2"
@@ -35,10 +35,11 @@ versions.gradle_bintray_plugin = "1.8.4"
3535
versions.gradle_versions_plugin = "0.21.0"
3636
versions.junit = "4.12"
3737
versions.kotlin = "1.2"
38+
versions.material = "1.0.0"
3839
versions.mockito = "2.13.3"
3940
versions.mockito_all = "1.10.19"
40-
versions.nullaway = "0.6.6"
41-
versions.violations_plugin = "1.52"
41+
versions.nullaway = "0.7.5"
42+
versions.violations_plugin = "1.56"
4243
ext.versions = versions
4344

4445
def commitCount = 'git rev-list --count HEAD'.execute().text.trim()

gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@ KEYSTORE_PATH=../keystore/release.keystore
1717
KEYSTORE_PROPERTIES_PATH=../keystore/keystore.properties
1818
org.gradle.jvmargs=-Xmx1536M
1919
org.gradle.parallel=true
20-
android.enableBuildCache=false
2120
android.useAndroidX=true
2221
android.enableJetifier=true
Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,6 @@
1-
#
2-
# Copyright 2018 Roberto Leinardi.
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
15-
#
1+
#Sat Jul 27 09:41:28 CEST 2019
162
distributionBase=GRADLE_USER_HOME
173
distributionPath=wrapper/dists
18-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
194
zipStoreBase=GRADLE_USER_HOME
205
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

sample/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,5 @@ dependencies {
7272
implementation "androidx.appcompat:appcompat:$versions.androidx_appcompat"
7373
implementation "androidx.recyclerview:recyclerview:$versions.androidx_recyclerview"
7474
implementation "androidx.constraintlayout:constraintlayout:$versions.androidx_constraintlayout"
75+
implementation "com.google.android.material:material:$versions.material"
7576
}

0 commit comments

Comments
 (0)