keejef
/
session-android
mirror of https://github.com/oxen-io/session-android
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Update AGP and a few essential dependencies (#1017)

Browse Source
pull/1710/head
SessionHero01 3 weeks ago committed by GitHub
parent 3ba50dae3f
commit 3e7c025161
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File

2
app/build.gradle
Unescape Escape View File

@ -37,7 +37,6 @@ def getGitHash = { ->
}
android {
compileSdkVersion androidCompileSdkVersion
namespace 'network.loki.messenger'
useLibrary 'org.apache.http.legacy'
@ -79,6 +78,7 @@ android {
versionCode canonicalVersionCode * postFixSize
versionName canonicalVersionName
compileSdk androidCompileSdkVersion
minSdkVersion androidMinimumSdkVersion
targetSdkVersion androidTargetSdkVersion

4
build.gradle
Unescape Escape View File

@ -21,8 +21,8 @@ buildscript {
// List plugins AND their versions here, but don't apply. This allows you to use the plugin
// in your module without specifying the version.
plugins {
id 'com.android.application' version '8.5.1' apply false
id 'com.android.library' version '8.5.1' apply false
id 'com.android.application' version "$gradlePluginVersion" apply false
id 'com.android.library' version "$gradlePluginVersion" apply false
id 'org.jetbrains.kotlin.android' version "$kotlinVersion" apply false
id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlinVersion" apply false
id 'org.jetbrains.kotlin.plugin.compose' version "$kotlinVersion" apply false

8
content-descriptions/build.gradle
Unescape Escape View File

@ -5,9 +5,9 @@ plugins {
android {
namespace 'org.session.content_descriptions'
compileSdk androidCompileSdkVersion
defaultConfig {
compileSdk androidCompileSdkVersion
minSdk androidMinimumSdkVersion
targetSdkVersion androidCompileSdkVersion
@ -22,11 +22,11 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '11'
}
}

10
gradle.properties
Unescape Escape View File

@ -12,14 +12,12 @@
# org.gradle.parallel=true
#Mon Jun 26 09:56:43 AEST 2023
android.enableJetifier=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
org.gradle.jvmargs=-Xmx3096M -Dkotlin.daemon.jvm.options\="-Xmx3096M"
gradlePluginVersion=8.5.2
gradlePluginVersion=8.9.0
googleServicesVersion=4.3.12
kotlinVersion=2.0.0
kspVersion=2.0.0-1.0.23
kotlinVersion=2.1.10
kspVersion=2.1.10-1.0.31
navVersion=2.8.0-beta05
android.useAndroidX=true
appcompatVersion=1.6.1
@ -27,7 +25,7 @@ coreVersion=1.13.1
coroutinesVersion=1.6.4
curve25519Version=0.6.0
jetpackHiltVersion=1.2.0
daggerHiltVersion=2.51.1
daggerHiltVersion=2.55
androidxHiltVersion = 1.2.0
glideVersion=4.16.0
jacksonDatabindVersion=2.9.8

2
gradle/wrapper/gradle-wrapper.properties vendored
Unescape Escape View File

@ -1,5 +1,5 @@
#Thu Nov 09 11:27:58 AEDT 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

2
libsession-util/build.gradle
Unescape Escape View File

@ -5,9 +5,9 @@ plugins {
android {
namespace 'network.loki.messenger.libsession_util'
compileSdkVersion androidCompileSdkVersion
defaultConfig {
compileSdk androidCompileSdkVersion
minSdkVersion androidMinimumSdkVersion
targetSdkVersion androidCompileSdkVersion

9
libsession/build.gradle
Unescape Escape View File

@ -8,9 +8,8 @@ plugins {
}
android {
compileSdkVersion androidCompileSdkVersion
defaultConfig {
compileSdk androidCompileSdkVersion
minSdkVersion androidMinimumSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@ -35,12 +34,12 @@ android {
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '11'
}
namespace 'org.session.libsession'

2
libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
Unescape Escape View File

@ -248,7 +248,7 @@ object SnodeAPI {
val validationCount = 3
val accountIDByteCount = 33
// Hash the ONS name using BLAKE2b
val onsName = onsName.toLowerCase(Locale.US)
val onsName = onsName.lowercase(Locale.US)
val nameAsData = onsName.toByteArray()
val nameHash = ByteArray(GenericHash.BYTES)
if (!sodium.cryptoGenericHash(nameHash, nameHash.size, nameAsData, nameAsData.size.toLong())) {

2
libsession/src/main/java/org/session/libsession/snode/utilities/OKHTTPUtilities.kt
Unescape Escape View File

@ -17,7 +17,7 @@ internal fun Request.getHeadersForOnionRequest(): Map<String, Any> {
for (name in headers.names()) {
val value = headers[name]
if (value != null) {
if (value.toLowerCase(Locale.US) == "true" || value.toLowerCase(Locale.US) == "false") {
if (value.lowercase(Locale.US) == "true" || value.lowercase(Locale.US) == "false") {
result[name] = value.toBoolean()
} else if (value.toIntOrNull() != null) {
result[name] = value.toInt()

2
libsession/src/main/java/org/session/libsession/utilities/Address.kt
Unescape Escape View File

@ -14,7 +14,7 @@ import java.util.regex.Matcher
import java.util.regex.Pattern
class Address private constructor(address: String) : Parcelable, Comparable<Address?> {
private val address: String = address.toLowerCase()
private val address: String = address.lowercase()
constructor(`in`: Parcel) : this(`in`.readString()!!) {}

9
libsignal/build.gradle
Unescape Escape View File

@ -4,19 +4,18 @@ plugins {
}
android {
compileSdkVersion androidCompileSdkVersion
defaultConfig {
compileSdk androidCompileSdkVersion
minSdkVersion androidMinimumSdkVersion
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '11'
}
namespace 'org.session.libsignal'
}

Write Preview
Loading…
Cancel
Save