-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #83 from TimPushkin/updates
Upgrade dependencies
- Loading branch information
Showing
12 changed files
with
191 additions
and
162 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| import java.util.Properties | ||
|
|
||
| plugins { | ||
| alias(libs.plugins.android.application) | ||
| alias(libs.plugins.jetbrains.kotlin.android) | ||
| alias(libs.plugins.androidx.room) | ||
| alias(libs.plugins.google.dagger.hilt.android) | ||
| alias(libs.plugins.google.devtools.ksp) | ||
| } | ||
|
|
||
| object Version { | ||
| private const val MAJOR = 1 | ||
| private const val MINOR = 4 | ||
| private const val PATCH = 0 | ||
|
|
||
| const val CODE = MAJOR * 10000 + MINOR * 100 + PATCH | ||
| const val NAME = "$MAJOR.$MINOR.$PATCH" | ||
| } | ||
|
|
||
| kotlin { | ||
| jvmToolchain(17) | ||
| compilerOptions { | ||
| freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn") | ||
| } | ||
| } | ||
|
|
||
| android { | ||
| namespace = "ru.spbu.depnav" | ||
| compileSdk = 34 | ||
|
|
||
| defaultConfig { | ||
| applicationId = "ru.spbu.depnav" | ||
| minSdk = 21 | ||
| targetSdk = 34 | ||
| versionCode = Version.CODE | ||
| versionName = Version.NAME | ||
|
|
||
| testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" | ||
| } | ||
|
|
||
| signingConfigs { | ||
| val keystorePropertiesFile = rootProject.file("keystore.properties") | ||
| if (keystorePropertiesFile.exists()) { | ||
| val keystoreProperties = Properties().apply { | ||
| load(keystorePropertiesFile.inputStream()) | ||
| } | ||
| create("release") { | ||
| storeFile = file(keystoreProperties.getProperty("storeFile")) | ||
| storePassword = keystoreProperties.getProperty("storePassword") | ||
| keyAlias = keystoreProperties.getProperty("keyAlias") | ||
| keyPassword = keystoreProperties.getProperty("keyPassword") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| isMinifyEnabled = true | ||
| proguardFiles( | ||
| getDefaultProguardFile("proguard-android-optimize.txt"), | ||
| "proguard-rules.pro" | ||
| ) | ||
| signingConfig = signingConfigs.findByName("release") | ||
| } | ||
| } | ||
|
|
||
| buildFeatures { | ||
| compose = true | ||
| } | ||
| composeOptions { | ||
| kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() | ||
| } | ||
| packaging { | ||
| resources { | ||
| excludes += "/META-INF/{AL2.0,LGPL2.1}" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation(libs.androidx.lifecycle.runtimeKtx) | ||
| implementation(libs.androidx.lifecycle.runtimeCompose) | ||
| implementation(libs.androidx.lifecycle.viewmodelCompose) | ||
|
|
||
| implementation(libs.androidx.room.runtime) | ||
| implementation(libs.androidx.room.ktx) | ||
| annotationProcessor(libs.androidx.room.compiler) | ||
| ksp(libs.androidx.room.compiler) | ||
|
|
||
| implementation(libs.google.dagger.hilt) | ||
| ksp(libs.google.dagger.hiltCompiler) | ||
|
|
||
| implementation(platform(libs.androidx.compose.bom)) | ||
| implementation(libs.androidx.compose.material3) | ||
| implementation(libs.androidx.compose.ui) | ||
| implementation(libs.androidx.compose.ui.tooling.preview) | ||
| debugImplementation(libs.androidx.compose.ui.tooling) | ||
|
|
||
| implementation(libs.androidx.core.ktx) | ||
| implementation(libs.androidx.activity.compose) | ||
| implementation(libs.plrapps.mapcompose) | ||
|
|
||
| testImplementation(libs.junit) | ||
| androidTestImplementation(libs.androidx.test.runner) | ||
| androidTestImplementation(libs.androidx.test.rules) | ||
| androidTestImplementation(libs.androidx.test.extJunit) | ||
| } | ||
|
|
||
| ksp { | ||
| arg("room.incremental", "true") | ||
| arg("room.generateKotlin", "true") | ||
| } | ||
|
|
||
| room { | ||
| schemaDirectory("$projectDir/schemas") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| plugins { | ||
| alias(libs.plugins.android.application) apply false | ||
| alias(libs.plugins.jetbrains.kotlin.android) apply false | ||
|
|
||
| // Must be declared in the same scope as AGP to fix https://github.com/google/dagger/issues/3068 | ||
| alias(libs.plugins.google.dagger.hilt.android) apply false | ||
| // Must be declared in the same scope as Hilt | ||
| alias(libs.plugins.google.devtools.ksp) apply false | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.