Skip to content

Commit 8ad8dda

Browse files
thellmundthellmund
committed
Update dependencies
1 parent 5935fa5 commit 8ad8dda

File tree

31 files changed

+127
-105
lines changed

31 files changed

+127
-105
lines changed

‎build.gradle‎

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

33
buildscript {
4-
ext {
5-
buildConfig = [
6-
minSdk : 15,
7-
minSdkJsr310: 26,
8-
compileSdk : 29,
9-
targetSdk : 29
10-
]
11-
versions = [
12-
appCompat : '1.0.2',
13-
emoji : '1.0.0',
14-
jodaTime : '2.10.3',
15-
jodaTimeAndroid: '2.10.2',
16-
jUnit : '4.12',
17-
kotlin : '1.3.50',
18-
threeTen : '1.4.0',
19-
threeTenAbp : '1.2.1',
20-
mockitoCore : '2.28.2',
21-
mockitoInline : '2.28.2'
22-
]
23-
libraries = [
24-
appCompat : "androidx.appcompat:appcompat:${versions.appCompat}",
25-
emoji : "androidx.emoji:emoji-bundled:${versions.emoji}",
26-
jodaTime : "joda-time:joda-time:${versions.jodaTime}",
27-
jodaTimeAndroid: "net.danlew:android.joda:${versions.jodaTimeAndroid}",
28-
jUnit : "junit:junit:${versions.jUnit}",
29-
kotlin : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}",
30-
threeTen : "org.threeten:threetenbp:${versions.threeTen}",
31-
threeTenAbp : "com.jakewharton.threetenabp:threetenabp:${versions.threeTenAbp}",
32-
mockitoCore : "org.mockito:mockito-core:${versions.mockitoCore}",
33-
mockitoInline : "org.mockito:mockito-inline:${versions.mockitoInline}"
34-
]
35-
}
4+
apply from: 'dependencies.gradle'
365
repositories {
376
jcenter()
387
google()
@@ -41,27 +10,23 @@ buildscript {
4110
}
4211
}
4312
dependencies {
44-
classpath 'com.android.tools.build:gradle:3.5.0'
13+
classpath 'com.android.tools.build:gradle:4.0.0'
4514
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
4615
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
47-
classpath 'org.jlleitschuh.gradle:ktlint-gradle:8.2.0'
16+
classpath 'org.jlleitschuh.gradle:ktlint-gradle:9.2.1'
17+
classpath 'com.github.ben-manes:gradle-versions-plugin:0.28.0'
4818
}
4919
}
5020

5121
allprojects {
52-
tasks.withType(Javadoc) {
53-
options.addStringOption('Xdoclint:none', '-quiet')
54-
options.addStringOption('encoding', 'UTF-8')
55-
options.addStringOption('charSet', 'UTF-8')
56-
}
57-
5822
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
5923
kotlinOptions {
6024
jvmTarget = '1.8'
6125
freeCompilerArgs = ['-XXLanguage:+InlineClasses']
6226
}
6327
}
6428

29+
apply plugin: 'com.github.ben-manes.versions'
6530
apply plugin: 'org.jlleitschuh.gradle.ktlint'
6631

6732
repositories {

‎core/build.gradle‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
apply plugin: 'com.github.dcendents.android-maven'
2-
31
group = 'com.github.thellmund.Android-Week-View'
4-
version = '4.0.0'
2+
version = '5.0.0'
53

4+
apply plugin: 'com.github.dcendents.android-maven'
65
apply plugin: 'com.android.library'
76
apply plugin: 'kotlin-android'
87
apply plugin: 'kotlin-android-extensions'
@@ -12,6 +11,14 @@ android {
1211
defaultConfig {
1312
minSdkVersion buildConfig.minSdk
1413
targetSdkVersion buildConfig.targetSdk
14+
15+
// Required for core library desugaring
16+
multiDexEnabled true
17+
}
18+
compileOptions {
19+
coreLibraryDesugaringEnabled true
20+
sourceCompatibility JavaVersion.VERSION_1_8
21+
targetCompatibility JavaVersion.VERSION_1_8
1522
}
1623
testOptions {
1724
unitTests.includeAndroidResources = true
@@ -26,14 +33,12 @@ dependencies {
2633
implementation libraries.appCompat
2734
implementation libraries.emoji
2835

29-
testImplementation libraries.jUnit
30-
testImplementation libraries.mockitoCore
31-
testImplementation libraries.mockitoInline
36+
coreLibraryDesugaring libraries.coreLibraryDesugaring
3237

33-
testImplementation "org.robolectric:robolectric:4.2"
34-
testImplementation "androidx.test:runner:1.2.0"
35-
testImplementation "androidx.test.ext:junit:1.1.1"
36-
testImplementation "androidx.test.espresso:espresso-intents:3.2.0"
37-
testImplementation "androidx.test.espresso:espresso-core:3.2.0"
38-
testImplementation "androidx.test.ext:truth:1.2.0"
38+
testImplementation testing.androidxjUnit
39+
testImplementation testing.androidxTestRunner
40+
testImplementation testing.jUnit
41+
testImplementation testing.mockitoCore
42+
testImplementation testing.mockitoInline
43+
testImplementation testing.robolectric
3944
}

‎core/src/test/java/com/alamkanak/weekview/DateExtensionsTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.alamkanak.weekview
22

3+
import java.util.Calendar
34
import org.junit.Assert.assertEquals
45
import org.junit.Assert.assertNotEquals
56
import org.junit.Test
6-
import java.util.Calendar
77

88
class DateExtensionsTest {
99

‎core/src/test/java/com/alamkanak/weekview/EventsLoadersTest.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ import androidx.test.platform.app.InstrumentationRegistry
77
import com.alamkanak.weekview.util.createDate
88
import com.alamkanak.weekview.util.createResolvedWeekViewEvent
99
import com.alamkanak.weekview.util.createWeekViewEvent
10-
import com.google.common.truth.Truth.assertThat
10+
import java.util.Calendar.FEBRUARY
11+
import java.util.Calendar.MARCH
12+
import org.junit.Assert.assertTrue
1113
import org.junit.Before
1214
import org.junit.Test
1315
import org.junit.runner.RunWith
16+
import org.mockito.Mockito.`when` as whenever
1417
import org.mockito.Mockito.mock
1518
import org.robolectric.RobolectricTestRunner
1619
import org.robolectric.annotation.Config
17-
import java.util.Calendar.FEBRUARY
18-
import java.util.Calendar.MARCH
19-
import org.mockito.Mockito.`when` as whenever
2020

2121
@RunWith(RobolectricTestRunner::class)
2222
@Config(sdk = [28])
@@ -77,6 +77,6 @@ class EventsLoadersTest {
7777
scrollToDate(date)
7878

7979
val events = assertOnMonthChangeCalled(fetchRange)
80-
assertThat(events).contains(event)
80+
assertTrue(event in events)
8181
}
8282
}

‎core/src/test/java/com/alamkanak/weekview/PeriodTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.alamkanak.weekview
22

3+
import java.util.Calendar
34
import org.junit.Assert.assertEquals
45
import org.junit.Test
5-
import java.util.Calendar
66

77
class PeriodTest {
88

‎core/src/test/java/com/alamkanak/weekview/ResolvedWeekViewEventTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import org.junit.Assert.assertFalse
55
import org.junit.Assert.assertTrue
66
import org.junit.Test
77
import org.mockito.Mockito
8-
import org.mockito.MockitoAnnotations
98
import org.mockito.Mockito.`when` as whenever
9+
import org.mockito.MockitoAnnotations
1010

1111
class ResolvedWeekViewEventTest {
1212

‎core/src/test/java/com/alamkanak/weekview/WeekViewRobot.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.alamkanak.weekview
22

33
import android.content.Context
4-
import com.google.common.truth.Truth.assertThat
4+
import java.util.Calendar
5+
import org.junit.Assert.assertTrue
56
import org.mockito.Mockito.verify
67
import org.mockito.Mockito.verifyNoMoreInteractions
7-
import java.util.Calendar
88

99
internal fun weekViewRobot(
1010
context: Context,
@@ -36,7 +36,7 @@ internal class WeekViewRobot(
3636
val dateRangeEvents = loader.refresh(date)
3737

3838
for (event in events) {
39-
assertThat(dateRangeEvents).contains(event)
39+
assertTrue(event in dateRangeEvents)
4040
}
4141
}
4242

@@ -75,16 +75,16 @@ internal class WeekViewRobot(
7575

7676
internal fun assertCachingEventsLoader() {
7777
val loader = weekView.eventsLoaderWrapper.currentEventsLoader
78-
assertThat(loader).isInstanceOf(CachingEventsLoader::class.java)
78+
assertTrue(loader is CachingEventsLoader)
7979
}
8080

8181
internal fun assertPagedEventsLoader() {
8282
val loader = weekView.eventsLoaderWrapper.currentEventsLoader
83-
assertThat(loader).isInstanceOf(PagedEventsLoader::class.java)
83+
assertTrue(loader is PagedEventsLoader)
8484
}
8585

8686
internal fun assertLegacyEventsLoader() {
8787
val loader = weekView.eventsLoaderWrapper.currentEventsLoader
88-
assertThat(loader).isInstanceOf(LegacyEventsLoader::class.java)
88+
assertTrue(loader is LegacyEventsLoader)
8989
}
9090
}

‎dependencies.gradle‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Top-level build file listing all dependencies.
2+
3+
ext {
4+
buildConfig = [
5+
minSdk : 15,
6+
minSdkJsr310: 26,
7+
compileSdk : 29,
8+
targetSdk : 29,
9+
]
10+
versions = [
11+
androidxjUnit : '1.1.1',
12+
androidxTestRunner : '1.2.0',
13+
appCompat : '1.1.0',
14+
coreLibraryDesugaring: '1.0.5',
15+
emoji : '1.1.0',
16+
jodaTime : '2.10.6',
17+
jodaTimeAndroid : '2.10.6',
18+
jUnit : '4.13',
19+
kotlin : '1.3.72',
20+
mockito : '3.3.3',
21+
robolectric : '4.3.1',
22+
threeTen : '1.4.4',
23+
threeTenAbp : '1.2.4',
24+
]
25+
libraries = [
26+
appCompat : "androidx.appcompat:appcompat:${versions.appCompat}",
27+
coreLibraryDesugaring: "com.android.tools:desugar_jdk_libs:${versions.coreLibraryDesugaring}",
28+
emoji : "androidx.emoji:emoji-bundled:${versions.emoji}",
29+
jodaTime : "joda-time:joda-time:${versions.jodaTime}",
30+
jodaTimeAndroid : "net.danlew:android.joda:${versions.jodaTimeAndroid}",
31+
kotlin : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}",
32+
threeTen : "org.threeten:threetenbp:${versions.threeTen}",
33+
threeTenAbp : "com.jakewharton.threetenabp:threetenabp:${versions.threeTenAbp}",
34+
]
35+
testing = [
36+
androidxjUnit : "androidx.test.ext:junit:${versions.androidxjUnit}",
37+
androidxTestRunner: "androidx.test:runner:${versions.androidxTestRunner}",
38+
jUnit : "junit:junit:${versions.jUnit}",
39+
mockitoCore : "org.mockito:mockito-core:${versions.mockito}",
40+
mockitoInline : "org.mockito:mockito-inline:${versions.mockito}",
41+
robolectric : "org.robolectric:robolectric:${versions.robolectric}",
42+
]
43+
}

‎gradle.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ POM_LICENCE_NAME=The Apache Software License, Version 2.0
1010
POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
1111
POM_LICENCE_DIST=repo
1212
POM_DEVELOPER_ID=thellmund
13-
POM_DEVELOPER_NAME=Till Hellmund
13+
POM_DEVELOPER_NAME=Till Hellmund
14+
15+
android.useAndroidX=true

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip

0 commit comments

Comments
 (0)