Skip to content

Commit e5d1a6c

Browse files
committed
Update dependencies
Signed-off-by: Kyle Corry <[email protected]>
1 parent 836f735 commit e5d1a6c

File tree

7 files changed

+17
-87
lines changed

7 files changed

+17
-87
lines changed

app/build.gradle.kts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12
import java.time.LocalDate
23

34
plugins {
@@ -59,7 +60,7 @@ android {
5960
)
6061
}
6162
// Play Store
62-
create("playStore"){
63+
create("playStore") {
6364
initWith(getByName("release"))
6465
}
6566
// GitHub
@@ -70,7 +71,7 @@ android {
7071

7172
// ------- DEVELOPMENT -------
7273
// Local debug
73-
getByName("debug"){
74+
getByName("debug") {
7475
testProguardFiles(
7576
getDefaultProguardFile("proguard-android-optimize.txt"),
7677
"proguard-rules.pro"
@@ -117,8 +118,11 @@ android {
117118
useLegacyPackaging = true
118119
}
119120
}
120-
kotlinOptions {
121-
jvmTarget = JavaVersion.VERSION_11.toString()
121+
122+
kotlin {
123+
compilerOptions {
124+
jvmTarget = JvmTarget.fromTarget(JavaVersion.VERSION_11.toString())
125+
}
122126
}
123127

124128
lint {

app/src/main/java/com/kylecorry/trail_sense/shared/andromeda_temp/ParallelCoroutineRunner2.kt

Lines changed: 0 additions & 74 deletions
This file was deleted.

app/src/main/java/com/kylecorry/trail_sense/shared/map_layers/MapLayerBackgroundTask.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.kylecorry.trail_sense.shared.map_layers
22

33
import com.kylecorry.andromeda.core.cache.AppServiceRegistry
44
import com.kylecorry.luna.coroutines.CoroutineQueueRunner
5+
import com.kylecorry.luna.coroutines.Parallel
56
import com.kylecorry.sol.science.geology.CoordinateBounds
6-
import com.kylecorry.trail_sense.shared.andromeda_temp.Parallel
77
import com.kylecorry.trail_sense.shared.andromeda_temp.grow
88
import com.kylecorry.trail_sense.shared.device.DeviceSubsystem
99
import com.kylecorry.trail_sense.shared.map_layers.tiles.TileMath

app/src/main/java/com/kylecorry/trail_sense/shared/map_layers/MapLayerBackgroundTask2.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package com.kylecorry.trail_sense.shared.map_layers
22

33
import com.kylecorry.andromeda.core.cache.AppServiceRegistry
44
import com.kylecorry.luna.coroutines.CoroutineQueueRunner
5+
import com.kylecorry.luna.coroutines.Parallel
56
import com.kylecorry.sol.math.geometry.Rectangle
67
import com.kylecorry.sol.science.geology.CoordinateBounds
7-
import com.kylecorry.trail_sense.shared.andromeda_temp.Parallel
88
import com.kylecorry.trail_sense.shared.andromeda_temp.grow
99
import com.kylecorry.trail_sense.shared.device.DeviceSubsystem
1010
import com.kylecorry.trail_sense.shared.map_layers.tiles.TileMath

app/src/main/java/com/kylecorry/trail_sense/shared/map_layers/ui/layers/tiles/FullRegionMapTileSource.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.kylecorry.trail_sense.shared.map_layers.ui.layers.tiles
22

33
import android.graphics.Bitmap
4+
import com.kylecorry.luna.coroutines.Parallel
45
import com.kylecorry.sol.science.geology.CoordinateBounds
5-
import com.kylecorry.trail_sense.shared.andromeda_temp.Parallel
66
import com.kylecorry.trail_sense.shared.andromeda_temp.from2
77
import com.kylecorry.trail_sense.shared.map_layers.tiles.Tile
88
import com.kylecorry.trail_sense.shared.map_layers.tiles.TileSource

app/src/main/java/com/kylecorry/trail_sense/tools/photo_maps/infrastructure/tiles/PhotoMapTileSourceSelector.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import com.kylecorry.andromeda.bitmaps.operations.Conditional
1111
import com.kylecorry.andromeda.bitmaps.operations.Convert
1212
import com.kylecorry.andromeda.bitmaps.operations.ReplaceColor
1313
import com.kylecorry.andromeda.bitmaps.operations.applyOperationsOrNull
14+
import com.kylecorry.luna.coroutines.Parallel
1415
import com.kylecorry.sol.math.SolMath
1516
import com.kylecorry.sol.science.geology.CoordinateBounds
16-
import com.kylecorry.trail_sense.shared.andromeda_temp.Parallel
1717
import com.kylecorry.trail_sense.shared.andromeda_temp.intersects2
1818
import com.kylecorry.trail_sense.shared.map_layers.tiles.Tile
1919
import com.kylecorry.trail_sense.shared.map_layers.tiles.TileSource

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[versions]
2-
androidApplication = "8.13.1"
2+
androidApplication = "8.13.2"
33
androidXTest = "1.7.0"
44
androidXTestRunner = "1.7.0"
55
androidXTestUiAutomator = "2.3.0"
66
androidXArchCore = "2.2.0"
77
androidXCoreRemoteViews = "1.1.0"
8-
androidXExifinterfaceVersion = "1.4.1"
8+
androidXExifinterfaceVersion = "1.4.2"
99
andromedaVersion = "18.1.1"
1010
cameraxVersion = "1.4.2"
1111
coreKtx = "1.17.0"
@@ -16,17 +16,17 @@ flexbox = "3.0.0"
1616
fragment = "1.8.9"
1717
gridlayout = "1.1.0"
1818
junitJupiter = "5.13.4"
19-
junitPlatformRunner = "1.13.4"
19+
junitPlatformRunner = "1.14.1"
2020
junitVersion = "1.3.0"
2121
junit = "4.13.2"
22-
kotlinAndroidVersion = "2.2.21"
22+
kotlinAndroidVersion = "2.3.0"
2323
kotlinxCoroutinesAndroid = "1.10.2"
2424
ksp = "2.3.3"
2525
legacySupportV4 = "1.0.0"
2626
navVersion = "2.9.6"
2727
lifecycleVersion = "2.10.0"
2828
material = "1.13.0"
29-
luna = "1.0.1"
29+
luna = "1.1.0"
3030
mockitoKotlin = "6.1.0"
3131
roomVersion = "2.8.4"
3232
sol = "15.3.0"

0 commit comments

Comments
 (0)