Skip to content

Commit 6fb5c4e

Browse files
committed
update libs
1 parent 3aa74a0 commit 6fb5c4e

File tree

7 files changed

+17
-38
lines changed

7 files changed

+17
-38
lines changed

.idea/runConfigurations.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,13 @@ dependencies {
9393
implementation project(':instead')
9494

9595
// Support libraries
96-
implementation 'androidx.appcompat:appcompat:1.3.0'
97-
implementation 'com.google.android.material:material:1.3.0'
98-
implementation "androidx.fragment:fragment-ktx:1.3.4"
99-
implementation 'androidx.preference:preference-ktx:1.1.1'
100-
implementation 'androidx.recyclerview:recyclerview:1.2.0'
96+
implementation "androidx.appcompat:appcompat:$rootProject.appcompat_version"
97+
implementation 'com.google.android.material:material:1.4.0'
98+
implementation "androidx.fragment:fragment-ktx:1.3.6"
99+
implementation "androidx.preference:preference-ktx:$rootProject.preference_ktx_version"
100+
implementation 'androidx.recyclerview:recyclerview:1.2.1'
101101
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
102-
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
102+
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
103103

104104
// Architecture components
105105
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$rootProject.lifecycle_version"

build.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,21 @@ buildscript {
1414

1515
kotlin_version = '1.4.31'
1616
kotlin_coroutines_version = '1.4.1'
17-
hilt_version = '2.36'
17+
hilt_version = '2.38.1'
1818
lifecycle_version = '2.3.1'
1919
room_version = '2.3.0'
2020
navigation_version = '2.3.5'
2121
acraVersion = '5.7.0'
2222
commons_io_version = '2.5' // 2.6 crashes the application on Android below 8, because java.nio.file is not available in these versions
23+
appcompat_version = '1.3.1'
24+
preference_ktx_version = '1.1.1'
2325
}
2426
repositories {
25-
jcenter()
27+
mavenCentral()
2628
google()
2729
}
2830
dependencies {
29-
classpath 'com.android.tools.build:gradle:4.2.1'
31+
classpath 'com.android.tools.build:gradle:7.0.1'
3032
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
3133
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
3234
classpath "de.mannodermaus.gradle.plugins:android-junit5:1.6.2.0"
@@ -39,7 +41,7 @@ plugins {
3941

4042
allprojects {
4143
repositories {
42-
jcenter()
44+
mavenCentral()
4345
google()
4446
}
4547
}

core-preferences/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ android {
1212
defaultConfig {
1313
minSdkVersion rootProject.min_sdk_version
1414
targetSdkVersion rootProject.compile_sdk_version
15-
versionCode rootProject.version_code
16-
versionName rootProject.version_name
1715

1816
consumerProguardFiles "consumer-rules.pro"
1917
}
@@ -40,8 +38,8 @@ android {
4038

4139
dependencies {
4240

43-
implementation 'androidx.appcompat:appcompat:1.3.0'
44-
implementation 'androidx.preference:preference-ktx:1.1.1'
41+
implementation "androidx.appcompat:appcompat:$rootProject.appcompat_version"
42+
implementation "androidx.preference:preference-ktx:$rootProject.preference_ktx_version"
4543

4644
// Kotlin
4745
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$rootProject.kotlin_version"

core-storage/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ android {
1212
defaultConfig {
1313
minSdkVersion rootProject.min_sdk_version
1414
targetSdkVersion rootProject.compile_sdk_version
15-
versionCode rootProject.version_code
16-
versionName rootProject.version_name
1715

1816
consumerProguardFiles "consumer-rules.pro"
1917
}
@@ -40,7 +38,7 @@ android {
4038

4139
dependencies {
4240

43-
implementation 'androidx.appcompat:appcompat:1.3.0'
41+
implementation "androidx.appcompat:appcompat:$rootProject.appcompat_version"
4442

4543
// Kotlin
4644
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$rootProject.kotlin_version"

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

instead/build.gradle

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ android {
1212
defaultConfig {
1313
minSdkVersion rootProject.min_sdk_version
1414
targetSdkVersion rootProject.compile_sdk_version
15-
versionCode rootProject.version_code
16-
versionName rootProject.version_name
1715

1816
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1917

@@ -76,7 +74,7 @@ dependencies {
7674
implementation project(':core-storage')
7775
implementation project(':core-preferences')
7876

79-
implementation 'androidx.appcompat:appcompat:1.3.0'
77+
implementation "androidx.appcompat:appcompat:$rootProject.appcompat_version"
8078

8179
// Kotlin
8280
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$rootProject.kotlin_version"
@@ -85,10 +83,6 @@ dependencies {
8583
// DI
8684
implementation "com.google.dagger:hilt-android:$rootProject.hilt_version"
8785
kapt "com.google.dagger:hilt-android-compiler:$rootProject.hilt_version"
88-
89-
testImplementation 'junit:junit:4.13.2'
90-
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
91-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
9286
}
9387

9488
task deleteDependencies(type: Delete) {

0 commit comments

Comments
 (0)