Skip to content

fix(android): upgrade build toolchain for Sonar compatibility #125

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.

Sign up for GitHub

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

Merged
swatigoel merged 1 commit into from
Aug 10, 2026
Merged

fix(android): upgrade build toolchain for Sonar compatibility #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 12 additions & 14 deletions kotlin/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ buildscript {
repositories {
google()
mavenCentral()
gradlePluginPortal()
}

dependencies {
classpath 'com.android.tools.build:gradle:4.2.0'
classpath 'com.android.tools.build:gradle:8.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3"
classpath "org.sonarqube:org.sonarqube.gradle.plugin:5.1.0.4872"
}
}

Expand All @@ -27,26 +28,31 @@ def getExtOrIntegerDefault(name) {
}

android {
compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
namespace "com.reactnativesecurekeystore"
compileSdk getExtOrIntegerDefault('compileSdkVersion')

defaultConfig {
minSdkVersion getExtOrIntegerDefault('minSdkVersion')
targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
minSdk getExtOrIntegerDefault('minSdkVersion')
targetSdk getExtOrIntegerDefault('targetSdkVersion')
}
buildTypes {
release {
minifyEnabled false
}
}

lintOptions {
lint {
disable 'GradleCompatible'
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = "1.8"
}
}

repositories {
Expand All @@ -64,14 +70,6 @@ dependencies {
implementation 'androidx.security:security-crypto:1.1.0-alpha05'
}

//TODO: To be removed once compile sdk version update is done
//Temp fix to avoid Secure keystore library build failure due to compileSdk of it lesser than one of its dependency (androidx.security:security-crypto:1.1.0-alpha05)
tasks.whenTaskAdded { task ->
if (task.name == "checkDebugAndroidTestAarMetadata") {
task.enabled = false
}
}

sonarqube {
properties {
property "sonar.java.binaries", "build/intermediates/javac/debug"
Expand Down
2 changes: 1 addition & 1 deletion kotlin/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SecureKeystore_kotlinVersion=1.7.0
SecureKeystore_kotlinVersion=1.9.23
SecureKeystore_minSdkVersion=23
SecureKeystore_targetSdkVersion=31
SecureKeystore_compileSdkVersion=31
Expand Down
Binary file modified kotlin/android/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion kotlin/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
Comment thread
abhip2565 marked this conversation as resolved.
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
41 changes: 28 additions & 13 deletions kotlin/android/gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 9 additions & 6 deletions kotlin/android/gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions kotlin/android/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.reactnativesecurekeystore">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.USE_BIOMETRIC" />
</manifest>
Loading