mirrors/Signal-Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-05 01:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update compileSdk to 35.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-12-20 12:11:19 -05:00
parent f20bb98804
commit 7dc6d4a532
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/animation/transitions/CrossfaderTransition.kt
View File

@@ -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
}

34
app/src/test/java/org/thoughtcrime/securesms/testing/ProxySignalSQLiteDatabase.kt
View File

@@ -32,14 +32,14 @@ class ProxySignalSQLiteDatabase(private val database: AndroidSQLiteDatabase) : S
database.setTransactionSuccessful()
}
override fun query(distinct: Boolean, table: String?, columns: Array<out String>?, selection: String?, selectionArgs: Array<out String>?, groupBy: String?, having: String?, orderBy: String?, limit: String?): Cursor {
override fun query(distinct: Boolean, table: String, columns: Array<out String>?, selection: String?, selectionArgs: Array<out String>?, 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<out String>?,
selection: String?,
selectionArgs: Array<out String>?,
@@ -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<out String>?, selection: String?, selectionArgs: Array<out String>?, groupBy: String?, having: String?, orderBy: String?): Cursor {
override fun query(table: String, columns: Array<out String>?, selection: String?, selectionArgs: Array<out String>?, groupBy: String?, having: String?, orderBy: String?): Cursor {
return database.query(table, columns, selection, selectionArgs, groupBy, having, orderBy)
}
override fun query(table: String?, columns: Array<out String>?, selection: String?, selectionArgs: Array<out String>?, groupBy: String?, having: String?, orderBy: String?, limit: String?): Cursor {
override fun query(table: String, columns: Array<out String>?, selection: String?, selectionArgs: Array<out String>?, 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<out String>?): Cursor {
override fun rawQuery(sql: String, selectionArgs: Array<out String>?): Cursor {
return database.rawQuery(sql, selectionArgs)
}
override fun rawQuery(sql: String?, args: Array<out Any>?): Cursor {
override fun rawQuery(sql: String, args: Array<out Any>?): Cursor {
return database.rawQuery(sql, args?.map(Any::toString)?.toTypedArray())
}
override fun rawQueryWithFactory(cursorFactory: net.zetetic.database.sqlcipher.SQLiteDatabase.CursorFactory?, sql: String?, selectionArgs: Array<out String>?, editTable: String?): Cursor {
override fun rawQueryWithFactory(cursorFactory: net.zetetic.database.sqlcipher.SQLiteDatabase.CursorFactory?, sql: String, selectionArgs: Array<out String>?, editTable: String): Cursor {
return database.rawQueryWithFactory(null, sql, selectionArgs, editTable)
}
override fun rawQuery(sql: String?, selectionArgs: Array<out String>?, initialRead: Int, maxRead: Int): Cursor {
override fun rawQuery(sql: String, selectionArgs: Array<out String>?, 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<out String>?): Int {
override fun delete(table: String, whereClause: String?, whereArgs: Array<out String>?): Int {
return database.delete(table, whereClause, whereArgs)
}
override fun update(table: String?, values: ContentValues?, whereClause: String?, whereArgs: Array<out String>?): Int {
override fun update(table: String, values: ContentValues?, whereClause: String?, whereArgs: Array<out String>?): Int {
return database.update(table, values, whereClause, whereArgs)
}
override fun updateWithOnConflict(table: String?, values: ContentValues?, whereClause: String?, whereArgs: Array<out String>?, conflictAlgorithm: Int): Int {
override fun updateWithOnConflict(table: String, values: ContentValues?, whereClause: String?, whereArgs: Array<out String>?, 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<out Any>?) {
override fun execSQL(sql: String, bindArgs: Array<out Any>) {
database.execSQL(sql, bindArgs)
}

2
build.gradle.kts
View File

@@ -39,7 +39,7 @@ tasks.withType<Wrapper> {
distributionType = Wrapper.DistributionType.ALL
}
apply(from = "${rootDir}/constants.gradle.kts")
apply(from = "$rootDir/constants.gradle.kts")
subprojects {
if (JavaVersion.current().isJava8Compatible) {

2
constants.gradle.kts
View File

@@ -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")

2
reproducible-builds/Dockerfile
View File

@@ -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

2
settings.gradle.kts
View File

@@ -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"