Skip to content

Commit 53ff483

Browse files
committed
Update android studio
1 parent 16b68db commit 53ff483

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

app/build.gradle.kts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
12
import java.io.FileInputStream
23
import java.text.SimpleDateFormat
34
import java.util.*
4-
import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
55

66
plugins {
77
id("com.android.application")
@@ -18,10 +18,10 @@ plugins {
1818
android {
1919
defaultConfig {
2020
applicationId = "com.example.moviedb"
21-
buildToolsVersion("30.0.3")
22-
minSdkVersion(23)
23-
compileSdkVersion(31)
24-
targetSdkVersion(31)
21+
buildToolsVersion = "30.0.3"
22+
minSdk = 23
23+
compileSdk = 31
24+
targetSdk = 31
2525
multiDexEnabled = true
2626
vectorDrawables {
2727
useSupportLibrary = true
@@ -93,13 +93,13 @@ android {
9393
flavorDimensions("server")
9494
productFlavors {
9595
create("dev") {
96-
dimension("server")
96+
// dimension("server")
9797
applicationIdSuffix = ".dev"
9898
resValue("string", "app_name", "Movie DB Dev")
9999
buildConfigField("boolean", "MOCK_DATA", "true")
100100
}
101101
create("prd") {
102-
dimension("server")
102+
// dimension("server")
103103
resValue("string", "app_name", "Movie DB")
104104
buildConfigField("boolean", "MOCK_DATA", "false")
105105
}
@@ -120,11 +120,11 @@ android {
120120
}
121121

122122
compileOptions {
123-
sourceCompatibility = JavaVersion.VERSION_1_8
124-
targetCompatibility = JavaVersion.VERSION_1_8
123+
sourceCompatibility(JavaVersion.VERSION_11)
124+
targetCompatibility(JavaVersion.VERSION_11)
125125
}
126126
kotlinOptions {
127-
jvmTarget = JavaVersion.VERSION_1_8.toString()
127+
jvmTarget = "11"
128128
freeCompilerArgs = listOf("-Xallow-result-return-type")
129129
}
130130
// https://developer.android.com/topic/libraries/data-binding
@@ -135,9 +135,9 @@ android {
135135

136136
dependencies {
137137
// common
138-
implementation("androidx.appcompat:appcompat:1.3.0")
138+
implementation("androidx.appcompat:appcompat:1.3.1")
139139
implementation("androidx.legacy:legacy-support-v4:1.0.0")
140-
implementation("androidx.constraintlayout:constraintlayout:2.1.0-beta02")
140+
implementation("androidx.constraintlayout:constraintlayout:2.1.0-rc01")
141141
implementation("androidx.recyclerview:recyclerview:1.2.1")
142142
implementation("com.google.android.material:material:1.4.0")
143143
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.10")
@@ -146,8 +146,8 @@ dependencies {
146146
// List of KTX extensions
147147
// https://developer.android.com/kotlin/ktx/extensions-list
148148
implementation("androidx.core:core-ktx:1.7.0-alpha01")
149-
implementation("androidx.activity:activity-ktx:1.3.0-rc02")
150-
implementation("androidx.fragment:fragment-ktx:1.3.5")
149+
implementation("androidx.activity:activity-ktx:1.3.0")
150+
implementation("androidx.fragment:fragment-ktx:1.3.6")
151151

152152
// Lifecycle
153153
// https://developer.android.com/jetpack/androidx/releases/lifecycle
@@ -158,7 +158,7 @@ dependencies {
158158

159159
// Preferences DataStore
160160
// https://android-developers.googleblog.com/2020/09/prefer-storing-data-with-jetpack.html
161-
implementation("androidx.datastore:datastore-preferences:1.0.0-rc01")
161+
implementation("androidx.datastore:datastore-preferences:1.0.0-rc02")
162162

163163
// room
164164
// https://developer.android.com/topic/libraries/architecture/room
@@ -168,7 +168,7 @@ dependencies {
168168

169169
// paging
170170
// https://developer.android.com/topic/libraries/architecture/paging
171-
implementation("androidx.paging:paging-runtime-ktx:3.1.0-alpha02")
171+
implementation("androidx.paging:paging-runtime-ktx:3.1.0-alpha03")
172172

173173
// navigation
174174
// https://developer.android.com/jetpack/androidx/releases/navigation
@@ -219,7 +219,7 @@ dependencies {
219219
// firebase
220220
// https://firebase.google.com/docs/android/setup
221221
implementation("com.google.firebase:firebase-analytics:19.0.0")
222-
implementation("com.google.firebase:firebase-crashlytics:18.1.0")
222+
implementation("com.google.firebase:firebase-crashlytics:18.2.0")
223223

224224
// lottie
225225
// https://github.com/airbnb/lottie-android

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
mavenCentral()
55
}
66
dependencies {
7-
classpath("com.android.tools.build:gradle:4.2.2")
7+
classpath("com.android.tools.build:gradle:7.0.0")
88
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10")
99
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5")
1010
classpath("com.google.dagger:hilt-android-gradle-plugin:2.28-alpha")

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-6.7.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip

0 commit comments

Comments
 (0)