Skip to content

Commit 0fbfd1b

Browse files
Merge pull request #68 from alan614/build-to-new-android-studio
Update kotlin, gradle and dependencies
2 parents 2ca828a + 62ddade commit 0fbfd1b

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

app/build.gradle

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

2323
android {
24-
compileSdkVersion 33
24+
namespace 'com.example.sqlbasics'
25+
compileSdk 34
2526

2627
defaultConfig {
2728
applicationId "com.example.sqlbasics"
2829
minSdkVersion 19
29-
targetSdkVersion 33
30+
targetSdkVersion 34
3031
versionCode 1
3132
versionName "1.0"
3233

@@ -49,10 +50,11 @@ android {
4950
}
5051

5152
dependencies {
52-
def room_version = '2.4.3'
53+
def room_version = '2.6.1'
5354

5455
implementation "androidx.room:room-runtime:$room_version"
5556
kapt "androidx.room:room-compiler:$room_version"
57+
//ksp("androidx.room:room-compiler:$room_version")
5658

5759
// optional - Kotlin Extensions and Coroutines support for Room
5860
implementation "androidx.room:room-ktx:$room_version"

build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,18 @@ buildscript {
2222
mavenCentral()
2323
}
2424
dependencies {
25-
classpath 'com.android.tools.build:gradle:7.3.1'
25+
classpath 'com.android.tools.build:gradle:8.7.2'
2626
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2727

2828
// NOTE: Do not place your application dependencies here; they belong
2929
// in the individual module build.gradle files
3030
}
3131
}
3232

33+
plugins {
34+
id 'org.jetbrains.kotlin.android' version '1.9.21' apply false
35+
}
36+
3337
allprojects {
3438
repositories {
3539
google()
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 07 09:17:40 PDT 2021
1+
#Tue Nov 05 23:39:28 CST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip

0 commit comments

Comments
 (0)