mirror
/
Look4Sat
kopia lustrzana https://github.com/rt-bishop/Look4Sat
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Updated dependencies and gradle plugin, minor fixes

develop
Arty Bishop 2024-09-20 11:23:42 +01:00
rodzic e3ebf7055c
commit 4890b7a625
6 zmienionych plików z 30 dodań i 29 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
.gitignore vendored
Wyświetl plik

@ -62,4 +62,5 @@ fastlane/readme.md
/app/release/app-release.aab /app/release/app-release.aab
/app/release/app-release.apk /app/release/app-release.apk
/app/release/output-metadata.json /app/release/output-metadata.json
/app/release/ /app/release/
/.kotlin/sessions/

8
app/build.gradle.kts
Wyświetl plik

@ -1,5 +1,6 @@
plugins { plugins {
alias(libs.plugins.android.application) alias(libs.plugins.android.application)
alias(libs.plugins.compose.compiler)
alias(libs.plugins.google.ksp) alias(libs.plugins.google.ksp)
alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.android)
} }
@ -10,11 +11,11 @@ kotlin {
android { android {
namespace = "com.rtbishop.look4sat" namespace = "com.rtbishop.look4sat"
compileSdk = 34 compileSdk = 35
defaultConfig { defaultConfig {
applicationId = "com.rtbishop.look4sat" applicationId = "com.rtbishop.look4sat"
minSdk = 26 minSdk = 26
targetSdk = 34 targetSdk = 35
versionCode = 314 versionCode = 314
versionName = "3.1.4" versionName = "3.1.4"
resourceConfigurations.addAll(listOf("en", "ru", "si", "zh-rCN", "anydpi")) resourceConfigurations.addAll(listOf("en", "ru", "si", "zh-rCN", "anydpi"))
@ -34,9 +35,6 @@ android {
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
} }
} }
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}
} }
dependencies { dependencies {

1
build.gradle.kts
Wyświetl plik

@ -1,6 +1,7 @@
plugins { plugins {
alias(libs.plugins.android.application) apply false alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false alias(libs.plugins.android.library) apply false
alias(libs.plugins.compose.compiler) apply false
alias(libs.plugins.google.ksp) apply false alias(libs.plugins.google.ksp) apply false
alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.kotlin.jvm) apply false alias(libs.plugins.kotlin.jvm) apply false

2
data/build.gradle.kts
Wyświetl plik

@ -10,7 +10,7 @@ kotlin {
android { android {
namespace = "com.rtbishop.look4sat.data" namespace = "com.rtbishop.look4sat.data"
compileSdk = 34 compileSdk = 35
defaultConfig { defaultConfig {
minSdk = 26 minSdk = 26
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

41
gradle/libs.versions.toml
Wyświetl plik

@ -1,18 +1,17 @@
[versions] [versions]
android-gradle-plugin = "8.5.0" android-gradle-plugin = "8.6.1"
google-ksp = "1.9.24-1.0.20" google-ksp = "2.0.20-1.0.25"
kotlin = "1.9.24" kotlin = "2.0.20"
androidx-core-ktx = "1.13.1" androidx-core-ktx = "1.13.1"
androidx-core-splashscreen = "1.0.1" androidx-core-splashscreen = "1.0.1"
androidx-room = "2.6.1" androidx-room = "2.6.1"
compose = "1.6.8" composeBom = "2024.09.02"
compose-activity = "1.9.0" compose-activity = "1.9.2"
compose-compiler = "1.5.14" compose-lifecycle = "2.8.6"
compose-lifecycle = "2.8.2" compose-material3 = "1.3.0"
compose-material3 = "1.2.1" compose-navigation = "2.8.1"
compose-navigation = "2.7.7"
other-coroutines = "1.8.1" other-coroutines = "1.8.1"
other-json = "20240303" other-json = "20240303"
@ -22,8 +21,8 @@ other-osmdroid = "6.1.18"
test-junit4 = "4.13.2" test-junit4 = "4.13.2"
test-mockk = "1.13.11" test-mockk = "1.13.11"
androidTest-junit = "1.2.0" androidTest-junit = "1.2.1"
androidTest-espresso = "3.6.0" androidTest-espresso = "3.6.1"
[libraries] [libraries]
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core-ktx" } androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core-ktx" }
@ -32,18 +31,19 @@ androidx-room = { module = "androidx.room:room-ktx", version.ref = "androidx-roo
androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "androidx-room" } androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "androidx-room" }
androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "androidx-room" } androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "androidx-room" }
compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
compose-animation = { group = "androidx.compose.animation", name = "animation" }
compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
compose-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
compose-activity = { module = "androidx.activity:activity-compose", version.ref = "compose-activity" } compose-activity = { module = "androidx.activity:activity-compose", version.ref = "compose-activity" }
compose-animation = { module = "androidx.compose.animation:animation", version.ref = "compose" }
compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" }
compose-lifecycle = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "compose-lifecycle" } compose-lifecycle = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "compose-lifecycle" }
compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" } compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" }
compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "compose-navigation" } compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "compose-navigation" }
compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "compose" }
compose-tooling = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
compose-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "compose-lifecycle" } compose-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "compose-lifecycle" }
compose-debug-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose" } compose-debug-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
compose-debug-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" } compose-debug-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
other-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "other-coroutines" } other-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "other-coroutines" }
other-json = { module = "org.json:json", version.ref = "other-json" } other-json = { module = "org.json:json", version.ref = "other-json" }
@ -60,15 +60,16 @@ androidTest-espresso = { module = "androidx.test.espresso:espresso-core", versio
[plugins] [plugins]
android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" } android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" } android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
google-ksp = { id = "com.google.devtools.ksp", version.ref = "google-ksp" } google-ksp = { id = "com.google.devtools.ksp", version.ref = "google-ksp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
[bundles] [bundles]
composeAll = [ composeAll = [
"compose-activity", "compose-animation", "compose-compiler", "compose-lifecycle", "compose-material3", "compose-bom", "compose-animation", "compose-runtime", "compose-tooling", "compose-activity",
"compose-navigation", "compose-runtime", "compose-tooling", "compose-viewmodel" "compose-lifecycle", "compose-material3", "compose-navigation", "compose-viewmodel"
] ]
composeDebug = ["compose-debug-manifest", "compose-debug-tooling"] composeDebug = ["compose-bom", "compose-debug-manifest", "compose-debug-tooling"]
unitTest = ["test-coroutines", "test-junit4", "test-mockk"] unitTest = ["test-coroutines", "test-junit4", "test-mockk"]
androidTest = ["androidTest-junit", "androidTest-espresso"] androidTest = ["androidTest-junit", "androidTest-espresso"]

4
gradle/wrapper/gradle-wrapper.properties vendored
Wyświetl plik

@ -1,6 +1,6 @@
#Fri Sep 01 22:09:30 BST 2023 #Fri Sep 20 11:12:19 BST 2024
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists