Merge PR #167

Yubico · Jan 21, 2025 · 251f098 · 251f098
2 parents 061076d + 78f4294
commit 251f098
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 34 deletions.
diff --git a/AndroidDemo/build.gradle b/AndroidDemo/build.gradle
@@ -7,10 +7,10 @@ plugins {
 
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdk 34
         versionName version
         versionCode 1
@@ -47,7 +47,7 @@ android {
 
 dependencies {
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
 
     implementation project(':android')
     implementation project(':management')
@@ -58,27 +58,25 @@ dependencies {
 
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
 
-    implementation 'androidx.core:core-ktx:1.13.1'
-    //noinspection GradleDependency - requires greater minSdkVersion
-    implementation 'androidx.fragment:fragment-ktx:1.7.1'
-    //noinspection GradleDependency - requires greater minSdkVersion
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.core:core-ktx:1.15.0'
+    implementation 'androidx.fragment:fragment-ktx:1.8.5'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.google.android.material:material:1.12.0'
 
     // Lifecycle
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
 
     // Navigation
-    def nav_version = '2.7.7'
+    def nav_version = '2.8.5'
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
     implementation "androidx.navigation:navigation-dynamic-features-fragment:$nav_version"
 
-    implementation 'org.bouncycastle:bcpkix-jdk15to18:1.78.1'
+    implementation 'org.bouncycastle:bcpkix-jdk15to18:1.80'
 
     implementation 'com.github.tony19:logback-android:3.0.0'
 

diff --git a/android/build.gradle b/android/build.gradle
@@ -6,11 +6,11 @@ plugins {
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         minSdkVersion 19
-        targetSdk 34
+        targetSdk 35
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -37,15 +37,15 @@ android {
 dependencies {
     api project(':core')
 
-    compileOnly 'androidx.annotation:annotation:1.8.2'
+    compileOnly 'androidx.annotation:annotation:1.9.1'
 
     testImplementation project(':testing')
     testImplementation 'androidx.test.ext:junit:1.2.1'
-    testImplementation 'org.robolectric:robolectric:4.11.1'
-    testImplementation 'org.mockito:mockito-core:5.13.0'
+    testImplementation 'org.robolectric:robolectric:4.12.1'
+    testImplementation 'org.mockito:mockito-core:5.15.2'
 
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test:runner:1.6.1'
+    androidTestImplementation 'androidx.test:runner:1.6.2'
 }
 
 description = "This module is the core library implementation and provides functionality to detect a YubiKey plugged in or tapped over NFC and to open an ISO/IEC 7816 connection that allows sending raw APDU commands to the key."

diff --git a/build.gradle b/build.gradle
@@ -2,21 +2,21 @@
 
 buildscript {
     ext {
-        kotlin_version = '2.0.0'
+        kotlin_version = '2.1.0'
     }
     repositories {
         mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.8.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 plugins {
     id 'maven-publish'
-    id 'com.diffplug.spotless' version "6.25.0" apply false
+    id 'com.diffplug.spotless' version "7.0.2" apply false
 }
 
 allprojects {

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -9,6 +9,6 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.18'
-    implementation 'com.android.tools.build:gradle:8.5.2'
+    implementation 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.1.1'
+    implementation 'com.android.tools.build:gradle:8.8.0'
 }
diff --git a/fido/build.gradle b/fido/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'yubikit-java-library'
 dependencies {
     api project(':core')
 
-    testImplementation 'org.mockito:mockito-core:5.13.0'
+    testImplementation 'org.mockito:mockito-core:5.15.2'
 }
 
 ext.pomName = "Yubico YubiKit ${project.name.capitalize()}"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jun 05 15:43:52 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/testing-android/build.gradle b/testing-android/build.gradle
@@ -5,11 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 34
+        targetSdkVersion 35
 
         testApplicationId 'com.yubico.yubikit.testing'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -38,12 +38,14 @@ android {
 
 dependencies {
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
 
-    implementation 'androidx.test:core:1.5.0'
-    implementation 'androidx.test:rules:1.5.0'
-    implementation 'androidx.test:runner:1.5.2'
-    implementation 'androidx.test.ext:junit:1.1.5'
+    implementation 'androidx.test:core:1.6.1'
+    implementation 'androidx.test:rules:1.6.1'
+    implementation 'androidx.test:runner:1.6.2'
+    implementation 'androidx.test.ext:junit:1.2.1'
+
+    implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
     api project(':android')
     api project(':fido')

diff --git a/testing/build.gradle b/testing/build.gradle
@@ -14,10 +14,10 @@ dependencies {
 
     api 'junit:junit:4.13.2'
 
-    implementation 'org.bouncycastle:bcpkix-jdk15to18:1.78.1'
+    implementation 'org.bouncycastle:bcpkix-jdk15to18:1.80'
 
     implementation 'org.hamcrest:hamcrest:3.0'
     implementation 'org.hamcrest:hamcrest-library:3.0'
 
-    implementation 'com.squareup.moshi:moshi:1.15.1'
+    implementation 'com.squareup.moshi:moshi:1.15.2'
 }