diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index cb5cb09e545812577800fa31b9e0cefb43a0c8d4..220cb3aef27330a61de057d219b7889820c77e75 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -103,7 +103,7 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.4.31"))
+ implementation(kotlin("stdlib", "1.5.0"))
// App Compat
implementation("com.google.android.material", "material", "1.1.0-alpha10")
@@ -120,7 +120,7 @@ dependencies {
withVersion("2.2.5") {
implementation("androidx.room", "room-runtime", version)
- annotationProcessor("androidx.room", "room-compiler", version)
+ kapt("androidx.room", "room-compiler", version)
implementation("androidx.room", "room-rxjava2", version)
testImplementation("androidx.room", "room-testing", version)
}
diff --git a/app/src/main/java/de/kuschku/quasseldroid/service/QuasselNotificationBackend.kt b/app/src/main/java/de/kuschku/quasseldroid/service/QuasselNotificationBackend.kt
index c032aa5dec9471a3e2313303f599343b0ede5b7d..c282bf3dc9d607ef8d9490cc49c12237c11aeb21 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/service/QuasselNotificationBackend.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/service/QuasselNotificationBackend.kt
@@ -256,7 +256,7 @@ class QuasselNotificationBackend @Inject constructor(
if (show) {
executor.schedule(
{
- results.map(NotificationData::bufferId).distinct().forEach { buffer ->
+ for (buffer in results.map(NotificationData::bufferId).distinct()) {
this.showNotification(buffer)
}
},
@@ -267,13 +267,13 @@ class QuasselNotificationBackend @Inject constructor(
}
fun showConnectedNotifications() {
- database.notifications().buffers().forEach { buffer ->
+ for (buffer in database.notifications().buffers()) {
this.showNotification(buffer, true)
}
}
fun showDisconnectedNotifications() {
- database.notifications().buffers().forEach { buffer ->
+ for (buffer in database.notifications().buffers()) {
this.showNotification(buffer, false)
}
}
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteHelper.kt
index af6568a098e59b104f9953b193edd4fda91c7bfe..607e6145d58a026a7ee8acd6df710d26d7dc0011 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteHelper.kt
@@ -139,8 +139,8 @@ class AutoCompleteHelper(
else -> it
}
}
- dataListeners.forEach {
- it(data)
+ for (dataListener in dataListeners) {
+ dataListener(data)
}
})
}
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt
index 4468c35edec2508c686dd25a34a7c4d5b5339033..b8976f7459aea3d00f53e7eb08d883151a44c9e1 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt
@@ -209,7 +209,7 @@ class AboutFragment : DaggerFragment() {
),
Library(
name = "Kotlin Standard Library",
- version = "1.4.31",
+ version = "1.5.0",
license = apache2,
url = "https://kotlinlang.org/"
),
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/ServiceBoundSetupActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/ServiceBoundSetupActivity.kt
index 420a2c03c3db839f1dbcafe149dd06491ae83f23..49c8f53f433ee6bfb451a49099cbaa201c635f49 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/ServiceBoundSetupActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/ServiceBoundSetupActivity.kt
@@ -187,7 +187,9 @@ abstract class ServiceBoundSetupActivity :
}
adapter = SlidePagerAdapter(supportFragmentManager)
- fragments.forEach(adapter::addFragment)
+ for (fragment in fragments) {
+ adapter.addFragment(fragment)
+ }
viewPager.adapter = adapter
pageChangeListener = SetupActivityViewPagerPageChangeListener(this)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SetupActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SetupActivity.kt
index ad12fd7cc0223cd4de55673da8e5db1581f35b98..8d2cbde440bab72cf91bea3055b55180742b2c1a 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SetupActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SetupActivity.kt
@@ -148,7 +148,9 @@ abstract class SetupActivity : DaggerAppCompatActivity() {
}
adapter = SlidePagerAdapter(supportFragmentManager)
- fragments.forEach(adapter::addFragment)
+ for (fragment in fragments) {
+ adapter.addFragment(fragment)
+ }
viewPager.adapter = adapter
pageChangeListener = SetupActivityViewPagerPageChangeListener(this)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SlidePagerAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SlidePagerAdapter.kt
index 112857f355b3d5fbaa29c60f93abf5b54c176688..87da92b8e48f8ca83a331a7a02c813d6250b17ed 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SlidePagerAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SlidePagerAdapter.kt
@@ -32,8 +32,8 @@ class SlidePagerAdapter(private val fragmentManager: FragmentManager) :
val result = Bundle()
get() {
- (0 until retainedFragments.size()).map(retainedFragments::valueAt).forEach {
- it.save(field)
+ for (index in 0 until retainedFragments.size()) {
+ retainedFragments.valueAt(index).save(field)
}
return field
}
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/network/NetworkSetupActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/network/NetworkSetupActivity.kt
index 2992b3fe84593f374e2fd12139e07ba31e7cfa93..8192dfd989c1aef0d666440c311541bba4ffcf0e 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/network/NetworkSetupActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/network/NetworkSetupActivity.kt
@@ -58,7 +58,7 @@ class NetworkSetupActivity : ServiceBoundSetupActivity() {
val buffer = bufferSyncer.find(networkId = networkId,
type = Buffer_Type.of(Buffer_Type.StatusBuffer))
if (buffer != null) {
- data.getStringArray("channels")?.toList().orEmpty().forEach {
+ for (it in data.getStringArray("channels").orEmpty()) {
sendInput(buffer, "/join $it")
}
}
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 1466f6157119a9d9c845289b30a3080fb6b8dc6f..aee4338573486892c4412ee87334f3251aa09882 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -109,8 +109,8 @@
<string name="label_reply">Réponse</string>
<string name="label_reset">Réinitialiser</string>
<string name="label_save">Sauvegarder</string>
- <string name="label_saving">En sauvegarde...</string>
- <string name="label_search">Rechercher...</string>
+ <string name="label_saving">En sauvegarde…</string>
+ <string name="label_search">Rechercher…</string>
<string name="label_search_buffer">Rechercher des chats</string>
<string name="label_search_channels">Rechercher des salons</string>
<string name="label_select">Sélectionner</string>
diff --git a/build.gradle.kts b/build.gradle.kts
index 5266e2575dba26ee4fba7e99cea7dedddc574a5d..9e078b1ebc6251484a2a089dad612d948627a57a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,6 +18,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+plugins {
+ java
+}
buildscript {
repositories {
@@ -26,7 +29,7 @@ buildscript {
}
dependencies {
classpath("com.android.tools.build:gradle:4.1.2")
- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31")
+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0")
}
}
@@ -39,11 +42,11 @@ allprojects {
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
- freeCompilerArgs += listOf(
- "-XXLanguage:+InlineClasses",
- "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes"
+ freeCompilerArgs = listOf(
+ "-Xinline-classes",
+ "-Xopt-in=kotlin.ExperimentalUnsignedTypes"
)
- jvmTarget = "1.6"
+ jvmTarget = "1.8"
}
}
}
diff --git a/invokergenerator/build.gradle.kts b/invokergenerator/build.gradle.kts
index e6d86c69c98a7e1aa650ed89619cac71409562dc..d4c228f8cf220799364985e0d341f6cb444868bc 100644
--- a/invokergenerator/build.gradle.kts
+++ b/invokergenerator/build.gradle.kts
@@ -29,10 +29,10 @@ tasks.withType<KotlinCompile> {
}
dependencies {
- implementation(kotlin("stdlib", "1.4.31"))
+ implementation(kotlin("stdlib", "1.5.0"))
implementation(project(":invokerannotations"))
- implementation("org.jetbrains.kotlin", "kotlin-compiler-embeddable", "1.4.31")
+ implementation("org.jetbrains.kotlin", "kotlin-compiler-embeddable", "1.5.0")
implementation("com.squareup", "kotlinpoet", "1.8.0")
compileOnly("com.google.auto.service:auto-service:1.0-rc7")
- annotationProcessor("com.google.auto.service:auto-service:1.0-rc7")
+ kapt("com.google.auto.service:auto-service:1.0-rc7")
}
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 14b450817a93b246fa2885c6cc12550e802b304a..91134539d2a427e1d04d67d25f4f2b017952dec4 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
}
dependencies {
- implementation(kotlin("stdlib", "1.4.31"))
+ implementation(kotlin("stdlib", "1.5.0"))
implementation("androidx.annotation", "annotation", "1.1.0")
diff --git a/lifecycle-ktx/build.gradle.kts b/lifecycle-ktx/build.gradle.kts
index f0ecdb5f3426a9a8d43381a00529b0fe27a44a38..295cd99f1c779060fa6cab572d68bb41cba5a9c9 100644
--- a/lifecycle-ktx/build.gradle.kts
+++ b/lifecycle-ktx/build.gradle.kts
@@ -22,7 +22,7 @@ plugins {
}
dependencies {
- implementation(kotlin("stdlib", "1.4.31"))
+ implementation(kotlin("stdlib", "1.5.0"))
implementation("androidx.annotation", "annotation", "1.1.0")
diff --git a/malheur/build.gradle.kts b/malheur/build.gradle.kts
index aece73181ff9f103264fdcb7a56a27cb60146032..b7a54d12c3592793f4a7fd092ae3777edb3786b5 100644
--- a/malheur/build.gradle.kts
+++ b/malheur/build.gradle.kts
@@ -42,7 +42,7 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.4.31"))
+ implementation(kotlin("stdlib", "1.5.0"))
implementation("com.google.code.gson", "gson", "2.8.5")
implementation("androidx.annotation", "annotation", "1.1.0")
diff --git a/persistence/build.gradle.kts b/persistence/build.gradle.kts
index 95891a99cc15b278fd2caf1c72b5d3455e8d69f1..998c82c00ee6e77f47f6f1b0059f9299ae5ca747 100644
--- a/persistence/build.gradle.kts
+++ b/persistence/build.gradle.kts
@@ -49,13 +49,13 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.4.31"))
+ implementation(kotlin("stdlib", "1.5.0"))
implementation("androidx.appcompat", "appcompat", "1.1.0")
withVersion("2.2.5") {
implementation("androidx.room", "room-runtime", version)
- annotationProcessor("androidx.room", "room-compiler", version)
+ kapt("androidx.room", "room-compiler", version)
implementation("androidx.room", "room-rxjava2", version)
testImplementation("androidx.room", "room-testing", version)
}
diff --git a/ui_spinner/build.gradle.kts b/ui_spinner/build.gradle.kts
index 436c0a0f57f9511789190a2e3575bdb5eaa0c28a..f6b9e34eb97abbc5e99e9ce9899823a066607629 100644
--- a/ui_spinner/build.gradle.kts
+++ b/ui_spinner/build.gradle.kts
@@ -42,6 +42,6 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.4.31"))
+ implementation(kotlin("stdlib", "1.5.0"))
implementation("androidx.appcompat", "appcompat", "1.1.0")
}
diff --git a/viewmodel/build.gradle.kts b/viewmodel/build.gradle.kts
index 91df20375ff72c92693d1bd68145214a74c26de8..6543719d8b39cffe4259707a7ca61a591dc636fc 100644
--- a/viewmodel/build.gradle.kts
+++ b/viewmodel/build.gradle.kts
@@ -42,7 +42,7 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.4.31"))
+ implementation(kotlin("stdlib", "1.5.0"))
implementation("androidx.appcompat", "appcompat", "1.1.0")
withVersion("2.2.0") {