Skip to content

Commit 5912f4f

Browse files
authored
Merge pull request #29 from odaridavid/update-dependencies
Update dependencies
2 parents c735e23 + d471bf0 commit 5912f4f

File tree

8 files changed

+50
-38
lines changed

8 files changed

+50
-38
lines changed

.idea/compiler.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

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

app/build.gradle

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ apply plugin: 'com.google.firebase.crashlytics'
66

77
android {
88

9-
compileSdkVersion 29
10-
buildToolsVersion "29.0.3"
9+
compileSdkVersion 30
10+
buildToolsVersion "30.0.3"
1111

1212
defaultConfig {
1313

@@ -17,7 +17,7 @@ android {
1717

1818
applicationId "com.github.odaridavid.designpatterns"
1919
minSdkVersion 21
20-
targetSdkVersion 29
20+
targetSdkVersion 30
2121
versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch
2222
versionName "$versionMajor.$versionMinor.$versionPatch"
2323

@@ -47,24 +47,28 @@ android {
4747
}
4848
viewBinding.enabled = true
4949
kotlinOptions.jvmTarget = 1.8
50+
51+
compileOptions {
52+
sourceCompatibility 1.8
53+
targetCompatibility 1.8
54+
}
5055
}
5156

5257
dependencies {
5358

54-
def material_design_version = "1.2.0-alpha06"
55-
def about_libraries_version = "8.1.2"
59+
def about_libraries_version = "8.9.1"
5660

5761
implementation fileTree(dir: 'libs', include: ['*.jar'])
58-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
59-
implementation 'androidx.appcompat:appcompat:1.2.0-rc01'
60-
implementation 'androidx.core:core-ktx:1.2.0'
61-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
62+
implementation "org.jetbrains.kotlin:kotlin-stdlib:1.5.21"
63+
implementation 'androidx.appcompat:appcompat:1.4.0-alpha03'
64+
implementation 'androidx.core:core-ktx:1.6.0'
65+
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
6266

6367
//In-app updates
64-
implementation 'com.google.android.play:core:1.7.2'
68+
implementation 'com.google.android.play:core:1.10.0'
6569

6670
//Material Design
67-
implementation "com.google.android.material:material:$material_design_version"
71+
implementation "com.google.android.material:material:1.5.0-alpha01"
6872

6973
//Libraries used info
7074
implementation "com.mikepenz:aboutlibraries-core:$about_libraries_version"
@@ -74,10 +78,10 @@ dependencies {
7478
implementation 'jp.wasabeef:recyclerview-animators:3.0.0'
7579

7680
//Analytics
77-
implementation 'com.google.firebase:firebase-analytics:17.4.0'
81+
implementation 'com.google.firebase:firebase-analytics:19.0.0'
7882

7983
//Crashlytics
80-
implementation 'com.google.firebase:firebase-crashlytics:17.0.0'
84+
implementation 'com.google.firebase:firebase-crashlytics:18.2.0'
8185

8286
//Preference
8387
implementation 'androidx.preference:preference-ktx:1.1.1'
@@ -87,6 +91,6 @@ dependencies {
8791

8892
//Unit testing
8993
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
90-
testImplementation 'junit:junit:4.13'
94+
testImplementation 'junit:junit:4.13.2'
9195
}
9296
apply plugin: 'com.google.gms.google-services'

build.gradle

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,30 @@
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.3.72'
4+
ext.kotlin_version = '1.5.20'
55
repositories {
6+
mavenCentral()
67
google()
7-
jcenter()
8-
8+
maven {
9+
url "https://plugins.gradle.org/m2/"
10+
}
911
}
1012
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.6.3'
13+
classpath 'com.android.tools.build:gradle:3.6.4'
1214
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
13-
classpath 'com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.1.2'
14-
classpath 'com.google.gms:google-services:4.3.3'
15-
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.0.0'
15+
classpath 'com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.9.1'
16+
classpath 'com.google.gms:google-services:4.3.8'
17+
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
1618
}
1719
}
1820

1921
allprojects {
2022
repositories {
23+
mavenCentral()
2124
google()
22-
jcenter()
23-
25+
maven {
26+
url "https://plugins.gradle.org/m2/"
27+
}
2428
}
2529
}
2630

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

0 commit comments

Comments
 (0)