Skip to content

Commit

Permalink
Upgrade Gradle and fix Room dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Reco1I committed Aug 14, 2024
1 parent 057769b commit b708fda
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 8 deletions.
27 changes: 20 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
buildscript {
ext{
kotlin_version = '1.9.22'
ext {
kotlin_version = '2.0.10'
room_version = '2.6.1'
}
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:8.2.2'
classpath 'com.android.tools.build:gradle:8.5.2'
classpath 'com.google.gms:google-services:4.4.1'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "androidx.room:room-gradle-plugin:$room_version"
}
}

plugins {
id 'com.google.devtools.ksp' version '2.0.10-1.0.24'
}

allprojects {
repositories {
maven { url 'https://jitpack.io' }
Expand Down Expand Up @@ -46,6 +52,7 @@ apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'
apply plugin: 'kotlin-android'
apply plugin: 'androidx.room'

android {
namespace 'ru.nsu.ccfit.zuev.osuplus'
Expand All @@ -57,6 +64,7 @@ android {
targetSdkVersion 29
versionCode getReleaseVersionCode()
versionName getReleaseVersionName()
multiDexEnabled true
ndk {
abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
}
Expand All @@ -67,6 +75,9 @@ android {
}
}

room {
schemaDirectory "$projectDir/schemas"
}

signingConfigs {
debug {
Expand Down Expand Up @@ -181,13 +192,15 @@ dependencies {
implementation 'commons-io:commons-io:2.15.1'

// Multiplayer
implementation('org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3')
implementation 'org.jetbrains.kotlin:kotlin-reflect:1.9.22'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
implementation ('io.socket:socket.io-client:2.1.0') {
exclude group: 'org.json', module: 'json'
}

// Room
implementation 'androidx.room:room-runtime:2.6.0'
implementation 'androidx.room:room-ktx:2.6.0'
implementation "androidx.room:room-runtime:$room_version"
annotationProcessor "androidx.room:room-compiler:$room_version"
ksp "androidx.room:room-compiler:$room_version"
implementation "androidx.room:room-ktx:$room_version"
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip

0 comments on commit b708fda

Please sign in to comment.