From 7dc6d4a532c831f9cdcfe33980f194bb7a7792d1 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 20 Dec 2024 12:11:19 -0500 Subject: [PATCH] Update compileSdk to 35. --- .../transitions/CrossfaderTransition.kt | 2 +- .../testing/ProxySignalSQLiteDatabase.kt | 34 +++++++++---------- build.gradle.kts | 2 +- constants.gradle.kts | 2 +- reproducible-builds/Dockerfile | 2 +- settings.gradle.kts | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/animation/transitions/CrossfaderTransition.kt b/app/src/main/java/org/thoughtcrime/securesms/animation/transitions/CrossfaderTransition.kt index 14a1e5c879..2f6ca081fd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/animation/transitions/CrossfaderTransition.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/animation/transitions/CrossfaderTransition.kt @@ -28,7 +28,7 @@ class CrossfaderTransition(context: Context, attrs: AttributeSet?) : Transition( } } - override fun createAnimator(sceneRoot: ViewGroup?, startValues: TransitionValues?, endValues: TransitionValues?): Animator? { + override fun createAnimator(sceneRoot: ViewGroup, startValues: TransitionValues?, endValues: TransitionValues?): Animator? { if (startValues == null || endValues == null) { return null } diff --git a/app/src/test/java/org/thoughtcrime/securesms/testing/ProxySignalSQLiteDatabase.kt b/app/src/test/java/org/thoughtcrime/securesms/testing/ProxySignalSQLiteDatabase.kt index 88dd08db0f..5c6cbceb3f 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/testing/ProxySignalSQLiteDatabase.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/testing/ProxySignalSQLiteDatabase.kt @@ -32,14 +32,14 @@ class ProxySignalSQLiteDatabase(private val database: AndroidSQLiteDatabase) : S database.setTransactionSuccessful() } - override fun query(distinct: Boolean, table: String?, columns: Array?, selection: String?, selectionArgs: Array?, groupBy: String?, having: String?, orderBy: String?, limit: String?): Cursor { + override fun query(distinct: Boolean, table: String, columns: Array?, selection: String?, selectionArgs: Array?, groupBy: String?, having: String?, orderBy: String?, limit: String?): Cursor { return database.query(distinct, table, columns, selection, selectionArgs, groupBy, having, orderBy, limit) } override fun queryWithFactory( cursorFactory: net.zetetic.database.sqlcipher.SQLiteDatabase.CursorFactory?, distinct: Boolean, - table: String?, + table: String, columns: Array?, selection: String?, selectionArgs: Array?, @@ -56,59 +56,59 @@ class ProxySignalSQLiteDatabase(private val database: AndroidSQLiteDatabase) : S return database.rawQuery(converted.where, converted.whereArgs) } - override fun query(table: String?, columns: Array?, selection: String?, selectionArgs: Array?, groupBy: String?, having: String?, orderBy: String?): Cursor { + override fun query(table: String, columns: Array?, selection: String?, selectionArgs: Array?, groupBy: String?, having: String?, orderBy: String?): Cursor { return database.query(table, columns, selection, selectionArgs, groupBy, having, orderBy) } - override fun query(table: String?, columns: Array?, selection: String?, selectionArgs: Array?, groupBy: String?, having: String?, orderBy: String?, limit: String?): Cursor { + override fun query(table: String, columns: Array?, selection: String?, selectionArgs: Array?, groupBy: String?, having: String?, orderBy: String?, limit: String?): Cursor { return database.query(table, columns, selection, selectionArgs, groupBy, having, orderBy, limit) } - override fun rawQuery(sql: String?, selectionArgs: Array?): Cursor { + override fun rawQuery(sql: String, selectionArgs: Array?): Cursor { return database.rawQuery(sql, selectionArgs) } - override fun rawQuery(sql: String?, args: Array?): Cursor { + override fun rawQuery(sql: String, args: Array?): Cursor { return database.rawQuery(sql, args?.map(Any::toString)?.toTypedArray()) } - override fun rawQueryWithFactory(cursorFactory: net.zetetic.database.sqlcipher.SQLiteDatabase.CursorFactory?, sql: String?, selectionArgs: Array?, editTable: String?): Cursor { + override fun rawQueryWithFactory(cursorFactory: net.zetetic.database.sqlcipher.SQLiteDatabase.CursorFactory?, sql: String, selectionArgs: Array?, editTable: String): Cursor { return database.rawQueryWithFactory(null, sql, selectionArgs, editTable) } - override fun rawQuery(sql: String?, selectionArgs: Array?, initialRead: Int, maxRead: Int): Cursor { + override fun rawQuery(sql: String, selectionArgs: Array?, initialRead: Int, maxRead: Int): Cursor { throw UnsupportedOperationException() } - override fun insert(table: String?, nullColumnHack: String?, values: ContentValues?): Long { + override fun insert(table: String, nullColumnHack: String?, values: ContentValues?): Long { return database.insert(table, nullColumnHack, values) } - override fun insertOrThrow(table: String?, nullColumnHack: String?, values: ContentValues?): Long { + override fun insertOrThrow(table: String, nullColumnHack: String?, values: ContentValues?): Long { return database.insertOrThrow(table, nullColumnHack, values) } - override fun replace(table: String?, nullColumnHack: String?, initialValues: ContentValues?): Long { + override fun replace(table: String, nullColumnHack: String?, initialValues: ContentValues?): Long { return database.replace(table, nullColumnHack, initialValues) } - override fun replaceOrThrow(table: String?, nullColumnHack: String?, initialValues: ContentValues?): Long { + override fun replaceOrThrow(table: String, nullColumnHack: String?, initialValues: ContentValues?): Long { return database.replaceOrThrow(table, nullColumnHack, initialValues) } - override fun insertWithOnConflict(table: String?, nullColumnHack: String?, initialValues: ContentValues?, conflictAlgorithm: Int): Long { + override fun insertWithOnConflict(table: String, nullColumnHack: String?, initialValues: ContentValues?, conflictAlgorithm: Int): Long { return database.insertWithOnConflict(table, nullColumnHack, initialValues, conflictAlgorithm) } - override fun delete(table: String?, whereClause: String?, whereArgs: Array?): Int { + override fun delete(table: String, whereClause: String?, whereArgs: Array?): Int { return database.delete(table, whereClause, whereArgs) } - override fun update(table: String?, values: ContentValues?, whereClause: String?, whereArgs: Array?): Int { + override fun update(table: String, values: ContentValues?, whereClause: String?, whereArgs: Array?): Int { return database.update(table, values, whereClause, whereArgs) } - override fun updateWithOnConflict(table: String?, values: ContentValues?, whereClause: String?, whereArgs: Array?, conflictAlgorithm: Int): Int { + override fun updateWithOnConflict(table: String, values: ContentValues?, whereClause: String?, whereArgs: Array?, conflictAlgorithm: Int): Int { return database.updateWithOnConflict(table, values, whereClause, whereArgs, conflictAlgorithm) } @@ -120,7 +120,7 @@ class ProxySignalSQLiteDatabase(private val database: AndroidSQLiteDatabase) : S database.execSQL(sql) } - override fun execSQL(sql: String?, bindArgs: Array?) { + override fun execSQL(sql: String, bindArgs: Array) { database.execSQL(sql, bindArgs) } diff --git a/build.gradle.kts b/build.gradle.kts index 20e0645bcc..0a7c5b16de 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,7 +39,7 @@ tasks.withType { distributionType = Wrapper.DistributionType.ALL } -apply(from = "${rootDir}/constants.gradle.kts") +apply(from = "$rootDir/constants.gradle.kts") subprojects { if (JavaVersion.current().isJava8Compatible) { diff --git a/constants.gradle.kts b/constants.gradle.kts index 2eeadb45d8..e6862fbaeb 100644 --- a/constants.gradle.kts +++ b/constants.gradle.kts @@ -1,5 +1,5 @@ val signalBuildToolsVersion by extra("34.0.0") -val signalCompileSdkVersion by extra("android-34") +val signalCompileSdkVersion by extra("android-35") val signalTargetSdkVersion by extra(34) val signalMinSdkVersion by extra(21) val signalNdkVersion by extra("27.0.12077973") diff --git a/reproducible-builds/Dockerfile b/reproducible-builds/Dockerfile index 94fc495949..05c9e77a82 100644 --- a/reproducible-builds/Dockerfile +++ b/reproducible-builds/Dockerfile @@ -15,7 +15,7 @@ RUN apt update RUN apt install -y git openjdk-17-jdk unzip wget ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME commandlinetools-linux-10406996_latest.zip -ENV ANDROID_API_LEVELS android-34 +ENV ANDROID_API_LEVELS android-35 ENV ANDROID_BUILD_TOOLS_VERSION 34.0.0 ENV ANDROID_HOME /usr/local/android-sdk-linux diff --git a/settings.gradle.kts b/settings.gradle.kts index 0d8e10c06b..3bc82d62f5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -37,7 +37,7 @@ dependencyResolutionManagement { } // To build libsignal from source, set the libsignalClientPath property in gradle.properties. -val libsignalClientPath = if (extra.has("libsignalClientPath")) extra.get("libsignalClientPath") else null; +val libsignalClientPath = if (extra.has("libsignalClientPath")) extra.get("libsignalClientPath") else null if (libsignalClientPath is String) { includeBuild(rootDir.resolve(libsignalClientPath + "/java")) { name = "libsignal-client"