Skip to content

Commit 5d74e0a

Browse files
authored
Merge pull request #19 from osuleymanova/update-versions-main
Kotlin and dependencies versions update for Main branch
2 parents fbe28d4 + db195ec commit 5d74e0a

File tree

4 files changed

+16
-18
lines changed

4 files changed

+16
-18
lines changed

app/build.gradle

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@ plugins {
2121
}
2222

2323
android {
24-
compileSdkVersion 30
25-
buildToolsVersion "30.0.3"
24+
compileSdkVersion 31
2625

2726
defaultConfig {
2827
applicationId "com.example.sqlbasics"
2928
minSdkVersion 19
30-
targetSdkVersion 30
29+
targetSdkVersion 31
3130
versionCode 1
3231
versionName "1.0"
3332

@@ -58,14 +57,12 @@ dependencies {
5857
// optional - Kotlin Extensions and Coroutines support for Room
5958
implementation "androidx.room:room-ktx:$room_version"
6059

61-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
62-
63-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
64-
implementation 'androidx.core:core-ktx:1.5.0'
65-
implementation 'androidx.appcompat:appcompat:1.3.0'
66-
implementation 'com.google.android.material:material:1.3.0'
67-
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
60+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
61+
implementation 'androidx.core:core-ktx:1.7.0'
62+
implementation 'androidx.appcompat:appcompat:1.3.1'
63+
implementation 'com.google.android.material:material:1.4.0'
64+
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
6865
testImplementation 'junit:junit:4.13.2'
69-
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
70-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
66+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
67+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
7168
}

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
android:roundIcon="@mipmap/ic_launcher_round"
2424
android:supportsRtl="true"
2525
android:theme="@style/Theme.SQLBasics">
26-
<activity android:name=".MainActivity">
26+
<activity android:name=".MainActivity"
27+
android:exported="true">
2728
<intent-filter>
2829
<action android:name="android.intent.action.MAIN" />
2930
<category android:name="android.intent.category.LAUNCHER" />

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1818
buildscript {
19-
ext.kotlin_version = "1.4.31"
19+
ext.kotlin_version = "1.5.31"
2020
repositories {
2121
google()
22-
jcenter()
22+
mavenCentral()
2323
}
2424
dependencies {
25-
classpath "com.android.tools.build:gradle:4.1.3"
25+
classpath 'com.android.tools.build:gradle:7.0.3'
2626
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2727

2828
// NOTE: Do not place your application dependencies here; they belong
@@ -33,7 +33,7 @@ buildscript {
3333
allprojects {
3434
repositories {
3535
google()
36-
jcenter()
36+
mavenCentral()
3737
}
3838
}
3939

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

0 commit comments

Comments
 (0)