Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update versions to the latest version #821

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,18 @@ if (keystorePropertiesFile.exists()) {
}

android {
compileSdk = project.libs.versions.app.build.compileSDKVersion.get().toInt()

compileSdk = 34
buildToolsVersion = "34.0.0"
ndkVersion = "25.1.8937393"

namespace = "com.simplemobiletools.smsmessenger"
defaultConfig {
applicationId = libs.versions.app.version.appId.get()
minSdk = project.libs.versions.app.build.minimumSDK.get().toInt()
targetSdk = project.libs.versions.app.build.targetSDK.get().toInt()
versionName = project.libs.versions.app.version.versionName.get()
versionCode = project.libs.versions.app.version.versionCode.get().toInt()
applicationId = "com.simplemobiletools.smsmessenger"
minSdk = 23
targetSdk = 34
versionName = "5.19.4"
versionCode = 86
ksp {
arg("room.schemaLocation", "$projectDir/schemas")
}
Expand All @@ -53,9 +57,12 @@ android {
buildTypes {
debug {
applicationIdSuffix = ".debug"
isMinifyEnabled = false
ndk.abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
}
release {
isMinifyEnabled = true
ndk.abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
Expand All @@ -73,22 +80,15 @@ android {
register("prepaid")
}

sourceSets {
getByName("main").java.srcDirs("src/main/kotlin")
}

compileOptions {
val currentJavaVersionFromLibs = JavaVersion.valueOf(libs.versions.app.build.javaVersion.get().toString())
sourceCompatibility = currentJavaVersionFromLibs
targetCompatibility = currentJavaVersionFromLibs
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = project.libs.versions.app.build.kotlinJVMTarget.get()
kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString()
}

namespace = libs.versions.app.version.appId.get()

lint {
checkReleaseBuilds = false
abortOnError = false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import kotlinx.serialization.SerializationException
import kotlinx.serialization.json.*

@Serializable(with = BackupSerializer::class)
sealed class MessagesBackup() {
sealed class MessagesBackup {
@SerialName("backupType")
abstract val backupType: BackupType
}

object BackupSerializer :
JsonContentPolymorphicSerializer<MessagesBackup>(MessagesBackup::class) {
override fun selectDeserializer(element: JsonElement): DeserializationStrategy<out MessagesBackup> {
override fun selectDeserializer(element: JsonElement): DeserializationStrategy<MessagesBackup> {
return when (element.jsonObject["backupType"]?.jsonPrimitive?.content) {
"sms" -> SmsBackup.serializer()
"mms" -> MmsBackup.serializer()
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ plugins {

tasks.register<Delete>("clean") {
delete {
rootProject.buildDir
rootProject.layout.buildDirectory
}
}
10 changes: 9 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx8192m
android.nonTransitiveRClass=true
kotlin.code.style=official
kotlin.incremental=true
org.gradle.caching=true
org.gradle.configuration-cache=true
org.gradle.configureondemand=true
org.gradle.daemon=true
org.gradle.jvmargs=-Xmx1024M -Dkotlin.daemon.jvm.options\="-Xmx1024M" -XX\:+UseParallelGC -XX\:MaxMetaspaceSize\=512m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8
org.gradle.parallel=true
20 changes: 5 additions & 15 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[versions]
#jetbrains
kotlin = "1.9.0"
kotlinxSerializationJson = "1.5.1"
kotlin = "1.9.23"
kotlinxSerializationJson = "1.6.3"
#KSP
ksp = "1.9.0-1.0.12"
ksp = "1.9.23-1.0.19"
#AndroidX
androidx-constraintlayout = "2.1.4"
androidx-swiperefreshlayout = "1.1.0"
androidx-lifecycleprocess = "2.6.1"
androidx-lifecycleprocess = "2.7.0"
#Eventbus
eventbus = "3.3.1"
#Room
Expand All @@ -17,20 +17,10 @@ simple-commons = "b72ded2a75"
android-smsmms = "c3e678befd"
indicator-fast-scroll = "4524cd0b61"
#Gradle
gradlePlugins-agp = "8.1.1"
#build
app-build-compileSDKVersion = "34"
app-build-targetSDK = "34"
app-build-minimumSDK = "23"
app-build-javaVersion = "VERSION_17"
app-build-kotlinJVMTarget = "17"
gradlePlugins-agp = "8.1.4"
#Helpers
ez-vcard = "0.11.3"
shortcut-badger = "1.1.22"
#versioning
app-version-appId = "com.simplemobiletools.smsmessenger"
app-version-versionCode = "85"
app-version-versionName = "5.19.3"
[libraries]
#AndroidX
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Nov 03 16:00:32 CET 2020
#Mon Mar 18 21:48:24 IRST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip