Skip to content

Commit ddfa40e

Browse files
HeyAlexHeyAlex
committed
update gradle
1 parent b308a29 commit ddfa40e

File tree

11 files changed

+30
-152
lines changed

11 files changed

+30
-152
lines changed

‎app/build.gradle

+11-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ apply plugin: 'kotlin-android'
55
apply plugin: 'kotlin-android-extensions'
66

77
android {
8-
compileSdkVersion 28
8+
compileSdk 31
99
defaultConfig {
1010
applicationId "com.github.heyalex.bottomdrawerexample"
1111
minSdkVersion 16
12-
targetSdkVersion 28
12+
targetSdkVersion 31
1313
versionCode 1
1414
versionName "1.0"
1515
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -24,6 +24,15 @@ android {
2424
repositories {
2525
maven { url "https://jitpack.io" }
2626
}
27+
28+
compileOptions {
29+
sourceCompatibility JavaVersion.VERSION_1_8
30+
targetCompatibility JavaVersion.VERSION_1_8
31+
}
32+
33+
kotlinOptions {
34+
jvmTarget = "1.8"
35+
}
2736
}
2837

2938
allprojects {

‎app/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
android:roundIcon="@mipmap/ic_launcher_round"
99
android:supportsRtl="true"
1010
android:theme="@style/AppTheme">
11-
<activity android:name=".MainActivity">
11+
<activity android:name=".MainActivity" android:exported="true">
1212
<intent-filter>
1313
<action android:name="android.intent.action.MAIN" />
1414

‎app/src/main/res/values-v21/styles.xml

-30
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,4 @@
1212
<item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.BottomDrawer.LargeComponent</item>
1313
</style>
1414

15-
<style name="ShapeAppearance.BottomDrawer.LargeComponent" parent="ShapeAppearance.MaterialComponents.LargeComponent">
16-
<item name="cornerFamily">cut</item>
17-
<item name="cornerSize">0dp</item>
18-
</style>
19-
20-
<style name="ShapeAppearanceOverlay.BottomDrawer" parent="ShapeAppearanceOverlay.TopLeftCut">
21-
<item name="cornerSizeTopLeft">@dimen/minimized_sheet_top_left_radius</item>
22-
</style>
23-
24-
<dimen name="minimized_sheet_top_left_radius">20dp</dimen>
25-
26-
27-
<style name="Plain" parent="BottomDialogTheme">
28-
<item name="bottom_sheet_extra_padding">0dp</item>
29-
<item name="should_draw_under_status_bar">false</item>
30-
31-
</style>
32-
33-
<style name="Pull" parent="BottomDialogTheme">
34-
<item name="bottom_sheet_extra_padding">0dp</item>
35-
<item name="bottom_sheet_corner_radius">26dp</item>
36-
<item name="should_draw_content_under_handle_view">true</item>
37-
</style>
38-
39-
<style name="Rotate" parent="BottomDialogTheme">
40-
<item name="bottom_sheet_extra_padding">0dp</item>
41-
<item name="bottom_sheet_corner_radius">26dp</item>
42-
<item name="should_draw_content_under_handle_view">true</item>
43-
</style>
44-
4515
</resources>

‎app/src/main/res/values-v23/styles.xml

-30
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,4 @@
1212
<item name="bottomSheetStyle">@style/Widget.MaterialComponents.BottomSheet.Modal</item>
1313
<item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.BottomDrawer.LargeComponent</item>
1414
</style>
15-
16-
<style name="ShapeAppearance.BottomDrawer.LargeComponent" parent="ShapeAppearance.MaterialComponents.LargeComponent">
17-
<item name="cornerFamily">cut</item>
18-
<item name="cornerSize">0dp</item>
19-
</style>
20-
21-
<style name="ShapeAppearanceOverlay.BottomDrawer" parent="ShapeAppearanceOverlay.TopLeftCut">
22-
<item name="cornerSizeTopLeft">@dimen/minimized_sheet_top_left_radius</item>
23-
</style>
24-
25-
<dimen name="minimized_sheet_top_left_radius">20dp</dimen>
26-
27-
28-
<style name="Plain" parent="BottomDialogTheme">
29-
<item name="bottom_sheet_extra_padding">4dp</item>
30-
<item name="should_draw_under_status_bar">true</item>
31-
32-
</style>
33-
34-
<style name="Pull" parent="BottomDialogTheme">
35-
<item name="bottom_sheet_extra_padding">0dp</item>
36-
<item name="bottom_sheet_corner_radius">26dp</item>
37-
</style>
38-
39-
<style name="Rotate" parent="BottomDialogTheme">
40-
<item name="bottom_sheet_extra_padding">0dp</item>
41-
<item name="bottom_sheet_corner_radius">26dp</item>
42-
<item name="should_draw_content_under_handle_view">true</item>
43-
</style>
44-
4515
</resources>

‎app/src/main/res/values-v27/styles.xml

-44
This file was deleted.

‎app/src/main/res/values-v29/styles.xml

-26
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,4 @@
1313
<item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.BottomDrawer.LargeComponent</item>
1414
</style>
1515

16-
<style name="ShapeAppearance.BottomDrawer.LargeComponent" parent="ShapeAppearance.MaterialComponents.LargeComponent">
17-
<item name="cornerFamily">cut</item>
18-
<item name="cornerSize">0dp</item>
19-
</style>
20-
21-
<style name="ShapeAppearanceOverlay.BottomDrawer" parent="ShapeAppearanceOverlay.TopLeftCut">
22-
<item name="cornerSizeTopLeft">@dimen/minimized_sheet_top_left_radius</item>
23-
</style>
24-
25-
<dimen name="minimized_sheet_top_left_radius">20dp</dimen>
26-
27-
<style name="Plain" parent="BottomDialogTheme">
28-
<item name="bottom_sheet_extra_padding">4dp</item>
29-
<item name="should_draw_under_status_bar">true</item>
30-
</style>
31-
32-
<style name="Pull" parent="BottomDialogTheme">
33-
<item name="bottom_sheet_extra_padding">0dp</item>
34-
<item name="bottom_sheet_corner_radius">26dp</item>
35-
</style>
36-
37-
<style name="Rotate" parent="BottomDialogTheme">
38-
<item name="bottom_sheet_extra_padding">0dp</item>
39-
<item name="bottom_sheet_corner_radius">26dp</item>
40-
<item name="should_draw_content_under_handle_view">true</item>
41-
</style>
4216
</resources>

‎app/src/main/res/values/styles.xml

+8-5
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,18 @@
1010
</style>
1111

1212
<style name="ShapeAppearance.BottomDrawer.LargeComponent" parent="ShapeAppearance.MaterialComponents.LargeComponent">
13-
<item name="cornerFamily">cut</item>
14-
<item name="cornerSize">0dp</item>
13+
<item name="cornerFamily">rounded</item>
14+
<item name="cornerSize">20dp</item>
1515
</style>
1616

17-
<style name="ShapeAppearanceOverlay.BottomDrawer" parent="ShapeAppearanceOverlay.TopLeftCut">
18-
<item name="cornerSizeTopLeft">@dimen/minimized_sheet_top_left_radius</item>
17+
<style name="ShapeAppearanceOverlay.BottomDrawer" parent="ShapeAppearanceOverlay">
18+
<item name="cornerFamily">rounded</item>
19+
<item name="cornerSize">20dp</item>
20+
<item name="cornerSizeTopLeft">@dimen/minimized_sheet_radius</item>
21+
<item name="cornerSizeTopRight">@dimen/minimized_sheet_radius</item>
1922
</style>
2023

21-
<dimen name="minimized_sheet_top_left_radius">20dp</dimen>
24+
<dimen name="minimized_sheet_radius">20dp</dimen>
2225

2326
<style name="Divider">
2427
<item name="android:background">?android:attr/listDivider</item>

‎bottomdrawer/build.gradle

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ apply plugin: 'kotlin-android-extensions'
33
apply plugin: 'kotlin-android'
44

55
android {
6-
compileSdkVersion 28
7-
8-
6+
compileSdkVersion 31
97

108
defaultConfig {
119
minSdkVersion 14
12-
targetSdkVersion 28
10+
targetSdkVersion 31
1311
versionCode 1
1412
versionName "1.0"
1513

‎bottomdrawer/src/main/java/com/github/heyalex/bottomdrawer/BottomDrawerDialog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ open class BottomDrawerDialog(context: Context, @StyleRes theme: Int = R.style.B
7979
bottomDrawerDelegate.onBackPressed()
8080
}
8181

82-
override fun onSaveInstanceState(): Bundle? {
82+
override fun onSaveInstanceState(): Bundle {
8383
val superState = super.onSaveInstanceState()
8484
bottomDrawerDelegate.onSaveInstanceState(superState)
8585
return superState

‎build.gradle

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.0.0'
5-
ext.kotlin_version = '1.3.11'
4+
ext.kotlin_version = '1.6.20'
65
repositories {
76
google()
8-
jcenter()
7+
mavenCentral()
98

109
}
1110
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.3.0'
11+
classpath 'com.android.tools.build:gradle:7.1.3'
1312
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1413
// NOTE: Do not place your application dependencies here; they belong
1514
// in the individual module build.gradle files
@@ -19,8 +18,7 @@ buildscript {
1918
allprojects {
2019
repositories {
2120
google()
22-
jcenter()
23-
21+
mavenCentral()
2422
}
2523
}
2624

‎gradle/wrapper/gradle-wrapper.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun May 12 18:55:59 MSK 2019
1+
#Sat Apr 23 13:15:53 MSK 2022
22
distributionBase=GRADLE_USER_HOME
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
34
distributionPath=wrapper/dists
4-
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
6+
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)