Skip to content

Commit a8cc744

Browse files
author
Zdeněk Balák
committed
REF: upgrade androidx libraries because of incompatibility between materials:1.0.0 and 1.1.0-alpha02
1 parent 749779a commit a8cc744

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

datetimepicker/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,22 @@ dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828

2929
// Arch
30-
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
31-
implementation 'androidx.lifecycle:lifecycle-runtime:2.0.0'
32-
kapt 'androidx.lifecycle:lifecycle-compiler:2.0.0'
30+
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
31+
implementation 'androidx.lifecycle:lifecycle-runtime:2.1.0'
32+
kapt 'androidx.lifecycle:lifecycle-compiler:2.1.0'
3333

3434
// Android
35-
implementation 'androidx.appcompat:appcompat:1.0.0'
35+
implementation 'androidx.appcompat:appcompat:1.1.0'
3636

3737
// Kotlin
3838
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
39-
implementation 'androidx.appcompat:appcompat:1.0.0'
40-
implementation 'com.google.android.material:material:1.0.0'
39+
implementation 'androidx.appcompat:appcompat:1.1.0'
40+
implementation 'com.google.android.material:material:1.1.0-beta02'
4141

4242
// Test
4343
testImplementation 'junit:junit:4.12'
4444
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
45-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
45+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
4646
}
4747

4848
repositories {

datetimepicker/src/main/java/wtf/qase/datetimepicker/DateTimePickerDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class DateTimePickerDialog : DialogFragment() {
2828
fun show(fragment: Fragment, tag: String, requestCode: Int, initialDate: Date? = null, pickerType: Int = DATE_TIME) {
2929
createInstance(initialDate, pickerType)
3030
.apply { setTargetFragment(fragment, requestCode) }
31-
.show(fragment.fragmentManager, tag)
31+
.show(fragment.requireFragmentManager(), tag)
3232
}
3333

3434
fun show(fragmentManager: FragmentManager, tag: String, onSuccess : (Date) -> Unit, initialDate: Date? = null, pickerType: Int = DATE_TIME) {

example/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ dependencies {
2828
implementation project(path: ':datetimepicker')
2929

3030
// Arch
31-
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
32-
implementation 'androidx.lifecycle:lifecycle-runtime:2.0.0'
33-
kapt 'androidx.lifecycle:lifecycle-compiler:2.0.0'
31+
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
32+
implementation 'androidx.lifecycle:lifecycle-runtime:2.1.0'
33+
kapt 'androidx.lifecycle:lifecycle-compiler:2.1.0'
3434

3535
// Android
36-
implementation 'androidx.appcompat:appcompat:1.0.0'
36+
implementation 'androidx.appcompat:appcompat:1.1.0'
3737

3838
// Kotlin
39-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50"
39+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.60"
4040

4141
// Test
4242
testImplementation 'junit:junit:4.12'
4343
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
44-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
44+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
4545
}

0 commit comments

Comments
 (0)