Skip to content

Commit 901e716

Browse files
muramrrmuramrr
committed
bump versions
1 parent 46cd145 commit 901e716

File tree

5 files changed

+26
-48
lines changed

5 files changed

+26
-48
lines changed

‎app/build.gradle

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ apply plugin: 'dagger.hilt.android.plugin'
2626

2727
android {
2828

29-
compileSdkVersion 30
30-
buildToolsVersion "30.0.3"
29+
compileSdkVersion 31
30+
buildToolsVersion "31.0.0"
3131

3232
defaultConfig {
3333
applicationId "com.mmdev.roove"
3434
minSdkVersion 21
35-
targetSdkVersion 30
35+
targetSdkVersion 31
3636
versionCode "$majorVersion$minorVersion$patchVersion".toInteger()
3737
versionName "$majorVersion.$minorVersion.$patchVersion"
3838
//testInstrumentationRunner globalConfiguration["testInstrumentationRunner"]
@@ -54,15 +54,6 @@ android {
5454
}
5555
}
5656

57-
compileOptions {
58-
sourceCompatibility = JavaVersion.VERSION_1_8
59-
targetCompatibility = JavaVersion.VERSION_1_8
60-
}
61-
62-
kotlinOptions {
63-
jvmTarget = JavaVersion.VERSION_1_8
64-
}
65-
6657
buildFeatures {
6758
dataBinding = true
6859
}
@@ -82,23 +73,23 @@ dependencies {
8273
implementation project(':data')
8374

8475
//core
85-
implementation ('androidx.core:core-ktx:1.5.0-alpha05')
76+
implementation ('androidx.core:core-ktx:1.8.0-alpha03')
8677
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
87-
implementation 'androidx.constraintlayout:constraintlayout:2.1.0-alpha2'
88-
implementation 'com.google.android.material:material:1.3.0-beta01'
89-
implementation ('androidx.lifecycle:lifecycle-process:2.3.0-rc01')
78+
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
79+
implementation 'com.google.android.material:material:1.6.0-alpha02'
80+
implementation ('androidx.lifecycle:lifecycle-process:2.5.0-alpha01')
9081

9182
// dagger hilt
92-
implementation ("com.google.dagger:hilt-android:2.30.1-alpha")
93-
kapt "com.google.dagger:hilt-android-compiler:2.30.1-alpha"
94-
implementation 'androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha02'
95-
kapt 'androidx.hilt:hilt-compiler:1.0.0-alpha02'
83+
implementation ("com.google.dagger:hilt-android:2.40.1")
84+
kapt "com.google.dagger:hilt-android-compiler:2.40.1"
85+
implementation 'androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03'
86+
kapt 'androidx.hilt:hilt-compiler:1.0.0'
9687

9788
//custom UI
9889
implementation ('com.github.chrisbanes:PhotoView:2.3.0')
9990

10091
//firebase
101-
implementation platform('com.google.firebase:firebase-bom:26.2.0')
92+
implementation platform('com.google.firebase:firebase-bom:29.0.4')
10293
implementation 'com.google.firebase:firebase-auth-ktx'
10394
implementation 'com.google.firebase:firebase-firestore-ktx'
10495
implementation 'com.google.firebase:firebase-storage-ktx'
@@ -108,7 +99,7 @@ dependencies {
10899

109100

110101
//facebook auth
111-
implementation 'com.facebook.android:facebook-login:8.2.0'
102+
implementation 'com.facebook.android:facebook-login:12.3.0'
112103

113104
//glide
114105
implementation 'com.github.bumptech.glide:glide:4.11.0'
@@ -119,8 +110,8 @@ dependencies {
119110

120111

121112
// Navigation component
122-
implementation "androidx.navigation:navigation-ui-ktx:2.3.2"
123-
implementation "androidx.navigation:navigation-fragment-ktx:2.3.2"
113+
implementation "androidx.navigation:navigation-ui-ktx:2.4.0"
114+
implementation "androidx.navigation:navigation-fragment-ktx:2.4.0"
124115

125116
// RxJava
126117
implementation "io.reactivex.rxjava3:rxjava:3.0.9"

‎build.gradle

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,22 @@
1919
buildscript {
2020

2121
ext {
22-
kotlin_version = '1.4.21'
22+
kotlin_version = '1.6.10'
2323
majorVersion = 2
2424
minorVersion = 0
2525
patchVersion = 1
2626
}
2727

2828

2929
dependencies {
30-
classpath 'com.android.tools.build:gradle:4.1.1'
31-
classpath 'com.google.gms:google-services:4.3.4'
30+
classpath 'com.android.tools.build:gradle:7.1.1'
31+
classpath 'com.google.gms:google-services:4.3.10'
3232
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
33-
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
34-
classpath 'com.google.dagger:hilt-android-gradle-plugin:2.30.1-alpha'
33+
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
34+
classpath 'com.google.dagger:hilt-android-gradle-plugin:2.40.1'
3535
}
3636

3737
repositories {
38-
jcenter()
3938
google()
4039
mavenCentral()
4140
}
@@ -45,7 +44,6 @@ buildscript {
4544
allprojects {
4645

4746
repositories {
48-
jcenter()
4947
google()
5048
mavenCentral()
5149
maven { url 'https://jitpack.io' }

‎data/build.gradle

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ apply plugin: 'kotlin-kapt'
2222

2323
android {
2424

25-
compileSdkVersion 30
26-
buildToolsVersion "30.0.3"
25+
compileSdkVersion 31
26+
buildToolsVersion "31.0.0"
2727

2828
def keyPropertiesFile = rootProject.file("key.properties")
2929
def keyProperties = new Properties()
@@ -33,9 +33,7 @@ android {
3333
buildConfigField("String", "FIREBASE_STORAGE_URL", keyProperties['FIREBASE_STORAGE_URL'])
3434

3535
minSdkVersion 21
36-
targetSdkVersion 30
37-
versionCode "$majorVersion$minorVersion$patchVersion".toInteger()
38-
versionName "$majorVersion.$minorVersion.$patchVersion"
36+
targetSdkVersion 31
3937
//testInstrumentationRunner globalConfiguration["testInstrumentationRunner"]
4038
}
4139

@@ -48,10 +46,6 @@ android {
4846

4947
}
5048

51-
kotlinOptions {
52-
jvmTarget = JavaVersion.VERSION_1_8
53-
}
54-
5549
}
5650

5751
dependencies {
@@ -75,8 +69,8 @@ dependencies {
7569
implementation "io.reactivex.rxjava3:rxjava:3.0.9"
7670

7771
// Dagger hilt
78-
implementation "com.google.dagger:hilt-android:2.30.1-alpha"
79-
kapt "com.google.dagger:hilt-android-compiler:2.30.1-alpha"
72+
implementation "com.google.dagger:hilt-android:2.40.1"
73+
kapt "com.google.dagger:hilt-android-compiler:2.40.1"
8074

8175
implementation 'com.github.delight-im:Android-SimpleLocation:v1.1.0'
8276

‎domain/build.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,4 @@ dependencies {
2626
// RxJava
2727
implementation "io.reactivex.rxjava3:rxjava:3.0.9"
2828

29-
}
30-
compileKotlin {
31-
kotlinOptions {
32-
jvmTarget = JavaVersion.VERSION_1_8
33-
}
3429
}

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ distributionBase=GRADLE_USER_HOME
2121
distributionPath=wrapper/dists
2222
zipStoreBase=GRADLE_USER_HOME
2323
zipStorePath=wrapper/dists
24-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
24+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip

0 commit comments

Comments
 (0)