majjo/XSnap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into refactor_2_0_0

Browse Source 
# Conflicts:
#	app/build.gradle.kts
#	core/src/main/assets/lang/de_DE.json
#	core/src/main/assets/lang/hu_HU.json
#	core/src/main/assets/lang/it_IT.json
#	core/src/main/assets/lang/tr_TR.json
#	core/src/main/kotlin/me/rhunk/snapenhance/action/impl/OpenMap.kt
#	core/src/main/kotlin/me/rhunk/snapenhance/features/impl/AutoUpdater.kt
#	core/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/StartupPageOverride.kt
#	core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/SettingsMenu.kt
#	gradle/libs.versions.toml
#	gradle/wrapper/gradle-wrapper.properties
This commit is contained in:
rhunk
2023-08-07 00:52:21 +02:00
parent 3fc6030a23 87c5f7dc55
commit 0bfb75d00c
13 changed files with 2464 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gradle/libs.versions.toml
View File

@@ -3,13 +3,14 @@ agp = "8.2.0-alpha14"
coil-compose = "2.4.0"
junit = "4.13.2"
kotlin = "1.8.22"
kotlinx-coroutines-android = "1.7.2"
kotlin-reflect = "1.8.22"
kotlinx-coroutines-android = "1.7.3"
kotlin-reflect = "1.9.0"
material-icons-core = "1.4.3"
material-icons-extended = "1.6.0-alpha02"
navigation-compose = "2.7.0-rc01"
recyclerview = "1.3.1"
gson = "2.10.1"
# DO NOT UPDATE FFMPEG-KIT TO "5.1" it breaks stuff :3
ffmpeg-kit = "5.1.LTS"
osmdroid-android = "6.1.16"
okhttp = "5.0.0-alpha.11"

6
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Fri May 12 21:23:16 CEST 2023
#Sun Aug 06 22:08:26 CEST 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists