Skip to content

Commit 4cfcf07

Browse files
committed
- more dependency updates
- recyclerView 1.2.0 - kotlin 1.4.32 - build tools 4.1.3 - iconics, materialdrawer, aboutlibs, detekt - lifecycle 2.3.1
1 parent baedbb6 commit 4cfcf07

File tree

3 files changed

+24
-17
lines changed

3 files changed

+24
-17
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ dependencies {
145145

146146
//Used to async operations
147147
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
148-
implementation 'io.reactivex.rxjava2:rxjava:2.2.20'
148+
implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
149149

150150
compileOnly "com.google.code.findbugs:jsr305:3.0.2"
151151

@@ -172,6 +172,6 @@ buildscript {
172172
jcenter()
173173
}
174174
dependencies {
175-
classpath "io.realm:realm-gradle-plugin:10.3.1"
175+
classpath "io.realm:realm-gradle-plugin:10.4.0"
176176
}
177177
}

build.gradle

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
]
1010

1111
setup = [
12-
gradleTools: '4.1.2',
12+
gradleTools: '4.1.3',
1313
compileSdk : 30,
1414
buildTools : "30.0.2",
1515
minSdk : 16,
@@ -18,30 +18,28 @@ buildscript {
1818

1919
versions = [
2020
androidX : '1.1.0',
21-
recyclerView : '1.1.0',
21+
recyclerView : '1.2.0',
2222
material : '1.3.0',
2323
appcompat : '1.2.0',
2424
drawerlayout : '1.1.0',
2525
constraintLayout: '2.0.4',
2626
cardview : '1.0.0',
27-
kotlin : '1.4.30',
28-
iconics : '5.2.5',
29-
materialdrawer : '8.3.2',
30-
aboutlib : '8.8.1',
27+
kotlin : '1.4.32',
28+
iconics : '5.2.8',
29+
materialdrawer : '8.4.0',
30+
aboutlib : '8.8.4',
3131
roboelectric : '4.5.1',
32-
detekt : '1.15.0',
32+
detekt : '1.16.0',
3333
paging : "2.1.2",
3434
room : "2.2.6",
35-
lifecycle : "2.2.0"
35+
lifecycle : "2.3.1"
3636
]
3737
}
3838

3939
repositories {
40-
google()
40+
gradlePluginPortal()
4141
mavenCentral()
42-
maven {
43-
url "https://plugins.gradle.org/m2/"
44-
}
42+
google()
4543
}
4644
dependencies {
4745
classpath "com.android.tools.build:gradle:${setup.gradleTools}"
@@ -55,9 +53,18 @@ allprojects {
5553
group "com.mikepenz"
5654

5755
repositories {
58-
google()
5956
mavenCentral()
60-
jcenter()
57+
google()
58+
maven {
59+
// (mp) remove when available on maven center
60+
url "https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven"
61+
content { includeGroup "org.jetbrains.kotlinx" }
62+
}
63+
}
64+
65+
configurations.all {
66+
resolutionStrategy.force "org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.3"
67+
// (mp) remove when available on maven center
6168
}
6269
}
6370

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)