Update to Kotlin 1.9.20, AGP 8.4.0, and Gradle 8.6

This commit is contained in:
Cody Henthorne 2024-05-17 10:48:55 -04:00
parent e647b31f29
commit 537fc0ef5c
13 changed files with 1246 additions and 18 deletions

View file

@ -152,7 +152,7 @@ android {
}
composeOptions {
kotlinCompilerExtensionVersion = "1.4.4"
kotlinCompilerExtensionVersion = "1.5.4"
}
defaultConfig {

View file

@ -398,6 +398,7 @@ public final class Megaphones {
.build();
}
@SuppressLint("NewApi")
public static @NonNull Megaphone buildGrantFullScreenIntentPermission(@NonNull Context context) {
return new Megaphone.Builder(Event.GRANT_FULL_SCREEN_INTENT, Megaphone.Style.BASIC)
.setTitle(R.string.GrantFullScreenIntentPermission_megaphone_title)

View file

@ -1,5 +1,6 @@
package org.thoughtcrime.securesms.util.views;
import android.annotation.SuppressLint;
import android.content.Context;
import android.util.AttributeSet;
import android.view.View;
@ -45,6 +46,7 @@ public class SlideUpWithSnackbarBehavior extends CoordinatorLayout.Behavior<View
child.setTranslationY(0);
}
@SuppressLint("RestrictedApi")
@Override
public boolean layoutDependsOn(@NonNull CoordinatorLayout parent,
@NonNull View child,

View file

@ -1,7 +1,7 @@
import org.gradle.kotlin.dsl.extra
buildscript {
val kotlinVersion by extra("1.8.10")
val kotlinVersion by extra("1.9.20")
repositories {
google()

View file

@ -51,7 +51,7 @@ android {
}
composeOptions {
kotlinCompilerExtensionVersion = "1.4.4"
kotlinCompilerExtensionVersion = "1.5.4"
}
}

View file

@ -1,7 +1,5 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
buildscript {
rootProject.extra["kotlin_version"] = "1.8.10"
rootProject.extra["kotlin_version"] = "1.9.20"
repositories {
google()
mavenCentral()
@ -14,7 +12,7 @@ buildscript {
}
dependencies {
classpath("com.android.tools.build:gradle:8.0.2")
classpath("com.android.tools.build:gradle:8.4.0")
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3")
classpath("com.google.protobuf:protobuf-gradle-plugin:0.9.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.extra["kotlin_version"] as String}")
@ -29,7 +27,7 @@ buildscript {
}
classpath("androidx.benchmark:benchmark-gradle-plugin:1.1.0-beta04")
classpath(files("$rootDir/wire-handler/wire-handler-1.0.0.jar"))
classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:1.8.10-1.0.9")
classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:1.9.20-1.0.14")
}
}

View file

@ -10,7 +10,7 @@ android {
}
composeOptions {
kotlinCompilerExtensionVersion = "1.4.4"
kotlinCompilerExtensionVersion = "1.5.4"
}
}

View file

@ -14,10 +14,10 @@ dependencyResolutionManagement {
version("androidx-window", "1.2.0")
version("exoplayer", "2.19.0")
version("glide", "4.15.1")
version("kotlin", "1.8.10")
version("kotlin", "1.9.20")
version("libsignal-client", "0.46.0")
version("mp4parser", "1.9.39")
version("android-gradle-plugin", "8.0.2")
version("android-gradle-plugin", "8.4.0")
version("accompanist", "0.28.0")
version("nanohttpd", "2.3.1")
@ -26,7 +26,7 @@ dependencyResolutionManagement {
library("android-application", "com.android.application", "com.android.application.gradle.plugin").versionRef("android-gradle-plugin")
// Compose
library("androidx-compose-bom", "androidx.compose:compose-bom:2023.09.01")
library("androidx-compose-bom", "androidx.compose:compose-bom:2023.10.01")
library("androidx-compose-material3", "androidx.compose.material3", "material3").withoutVersion()
library("androidx-compose-ui-tooling-preview", "androidx.compose.ui", "ui-tooling-preview").withoutVersion()
library("androidx-compose-ui-tooling-core", "androidx.compose.ui", "ui-tooling").withoutVersion()
@ -39,7 +39,7 @@ dependencyResolutionManagement {
library("accompanist-permissions", "com.google.accompanist", "accompanist-permissions").versionRef("accompanist")
// Desugaring
library("android-tools-desugar", "com.android.tools:desugar_jdk_libs:1.1.5")
library("android-tools-desugar", "com.android.tools:desugar_jdk_libs:1.1.6")
// Kotlin
library("kotlin-stdlib-jdk8", "org.jetbrains.kotlin", "kotlin-stdlib-jdk8").versionRef("kotlin")

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=47a5bfed9ef814f90f8debcbbb315e8e7c654109acd224595ea39fca95c5d4da
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
distributionSha256Sum=85719317abd2112f021d4f41f09ec370534ba288432065f4b477b6a3b652910d
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View file

@ -19,6 +19,7 @@ android {
compileSdkVersion = signalCompileSdkVersion
compileOptions {
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = signalJavaVersion
targetCompatibility = signalJavaVersion
}
@ -49,6 +50,7 @@ android {
}
dependencies {
coreLibraryDesugaring(libs.android.tools.desugar)
lintChecks(project(":lintchecks"))
implementation(project(":core-util"))

View file

@ -48,7 +48,7 @@ android {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.4.3"
kotlinCompilerExtensionVersion = "1.5.4"
}
packaging {
resources {

View file

@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
plugins {
id("org.jetbrains.kotlin.jvm") version "1.8.10"
id("org.jetbrains.kotlin.jvm") version "1.9.20"
`java-library`
}