Skip to content

Commit e4a6f1d

Browse files
authored
Merge pull request #883 from Droid-ify/sdk-35
Upgrade SDK to 35
2 parents b5e7ed3 + c7849df commit e4a6f1d

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

app/src/main/kotlin/com/looker/droidify/service/DownloadService.kt

+6
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,12 @@ class DownloadService : ConnectionService<DownloadService.Binder>() {
188188
}
189189
}
190190

191+
override fun onTimeout(startId: Int) {
192+
super.onTimeout(startId)
193+
onDestroy()
194+
stopSelf()
195+
}
196+
191197
override fun onDestroy() {
192198
super.onDestroy()
193199
cancelTasks(null)

app/src/main/kotlin/com/looker/droidify/service/SyncService.kt

+6
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,12 @@ class SyncService : ConnectionService<SyncService.Binder>() {
216216
}
217217
}
218218

219+
override fun onTimeout(startId: Int) {
220+
super.onTimeout(startId)
221+
onDestroy()
222+
stopSelf()
223+
}
224+
219225
override fun onDestroy() {
220226
super.onDestroy()
221227
downloadConnection.unbind(this)

build-logic/structure/src/main/kotlin/DefaultConfig.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
object DefaultConfig {
22
// Update [release_build.yml] along with this
3-
const val buildTools: String = "34.0.0"
3+
const val buildTools: String = "35.0.0"
44
const val appId = "com.looker.droidify"
5-
const val compileSdk = 34
5+
const val compileSdk = 35
66
const val minSdk = 23
77
// Check for TODOs before update
88
const val versionCode = 630

sync/fdroid/src/main/kotlin/com/looker/sync/fdroid/v2/EntrySyncable.kt

-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ import com.looker.sync.fdroid.v2.model.Entry
1616
import com.looker.sync.fdroid.v2.model.IndexV2
1717
import com.looker.sync.fdroid.v2.model.IndexV2Diff
1818
import kotlinx.coroutines.CoroutineDispatcher
19-
import kotlinx.coroutines.async
20-
import kotlinx.coroutines.launch
2119
import kotlinx.coroutines.withContext
2220
import kotlinx.serialization.ExperimentalSerializationApi
2321
import kotlinx.serialization.json.Json

0 commit comments

Comments
 (0)