wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5941 from k9mail/update_build_tools

Browse source 
Update build tools
This commit is contained in:
cketti 2022-03-04 00:54:56 +01:00 committed by GitHub
commit 721273ddbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt
View file

@ -17,7 +17,6 @@ internal data class NotificationData(
val isSingleMessageNotification: Boolean
get() = activeNotifications.size == 1
@OptIn(ExperimentalStdlibApi::class)
val messageReferences: List<MessageReference>
get() {
return buildList(capacity = newMessagesCount) {

2
app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt
View file

@ -41,7 +41,6 @@ internal class SingleMessageNotificationDataCreator {
)
}
@OptIn(ExperimentalStdlibApi::class)
private fun createSingleNotificationActions(): List<NotificationAction> {
return buildList {
add(NotificationAction.Reply)
@ -53,7 +52,6 @@ internal class SingleMessageNotificationDataCreator {
}
}
@OptIn(ExperimentalStdlibApi::class)
private fun createSingleNotificationWearActions(account: Account): List<WearNotificationAction> {
return buildList {
add(WearNotificationAction.Reply)

2
app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt
View file

@ -43,7 +43,6 @@ internal class SummaryNotificationDataCreator(
)
}
@OptIn(ExperimentalStdlibApi::class)
private fun createSummaryNotificationActions(): List<SummaryNotificationAction> {
return buildList {
add(SummaryNotificationAction.MarkAsRead)
@ -54,7 +53,6 @@ internal class SummaryNotificationDataCreator(
}
}
@OptIn(ExperimentalStdlibApi::class)
private fun createSummaryWearNotificationActions(account: Account): List<SummaryWearNotificationAction> {
return buildList {
add(SummaryWearNotificationAction.MarkAsRead)

1
app/core/src/test/java/com/fsck/k9/notification/SummaryNotificationDataCreatorTest.kt
View file

@ -266,7 +266,6 @@ class SummaryNotificationDataCreatorTest {
return NotificationData(account, activeNotifications, inactiveNotifications = emptyList())
}
@OptIn(ExperimentalStdlibApi::class)
private fun createNotificationDataWithMultipleMessages(times: Int = 2): NotificationData {
val contentList = buildList {
repeat(times) {

6
app/ui/legacy/src/main/java/com/fsck/k9/ui/FlowExtensions.kt
View file

@ -5,13 +5,13 @@ import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.FlowCollector
import kotlinx.coroutines.launch
fun <T> Flow<T>.observe(lifecycleOwner: LifecycleOwner, action: suspend (T) -> Unit) {
fun <T> Flow<T>.observe(lifecycleOwner: LifecycleOwner, collector: FlowCollector<T>) {
lifecycleOwner.lifecycleScope.launch {
lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
collect(action)
collect(collector)
}
}
}

10
build.gradle
View file

@ -6,13 +6,13 @@ buildscript {
'compileSdk': 31,
'targetSdk': 31,
'minSdk': 21,
'buildTools': '30.0.3',
'buildTools': '32.0.0',
'robolectricSdk': 31
]
versions = [
'kotlin': '1.5.31',
'kotlinCoroutines': '1.5.2',
'kotlin': '1.6.10',
'kotlinCoroutines': '1.6.0',
'androidxAppCompat': '1.3.1',
'androidxActivity': '1.4.0',
'androidxRecyclerView': '1.2.1',
@ -32,7 +32,7 @@ buildscript {
'fastAdapter': '5.5.1',
'preferencesFix': '1.1.0',
'okio': '2.10.0',
'moshi': '1.12.0',
'moshi': '1.13.0',
'timber': '5.0.1',
'koin': '3.1.3',
'commonsIo': '2.6',
@ -65,7 +65,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.3'
classpath 'com.android.tools.build:gradle:7.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath "org.jlleitschuh.gradle:ktlint-gradle:10.0.0"
}

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View file

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists