Skip to content

Commit

Permalink
Merge PR #149
Browse files Browse the repository at this point in the history
  • Loading branch information
AdamVe committed Aug 12, 2024
2 parents 5527bef + 3643b94 commit 1516cf6
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions AndroidDemo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ dependencies {
implementation 'com.google.android.material:material:1.12.0'

// Lifecycle
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4"
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"

// Navigation
Expand All @@ -84,7 +84,7 @@ dependencies {

testImplementation 'junit:junit:4.13.2'

androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'

}
8 changes: 4 additions & 4 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ android {
dependencies {
api project(':core')

compileOnly 'androidx.annotation:annotation:1.8.0'
compileOnly 'androidx.annotation:annotation:1.8.2'

testImplementation project(':testing')
testImplementation 'androidx.test.ext:junit:1.1.5'
testImplementation 'androidx.test.ext:junit:1.2.1'
testImplementation 'org.robolectric:robolectric:4.11.1'
testImplementation 'org.mockito:mockito-core:5.12.0'

androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test:runner:1.6.1'
}

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."
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

buildscript {
ext {
kotlin_version = '1.9.24'
kotlin_version = '2.0.0'
}
repositories {
mavenCentral()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.4.2'
classpath 'com.android.tools.build:gradle:8.5.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ repositories {

dependencies {
implementation 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.18'
implementation 'com.android.tools.build:gradle:8.4.2'
implementation 'com.android.tools.build:gradle:8.5.2'
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/groovy/project-convention-logging.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dependencies {
implementation 'org.slf4j:slf4j-api:2.0.13'
implementation 'org.slf4j:slf4j-api:2.0.16'
}
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'yubikit-java-library'

dependencies {
api 'org.slf4j:slf4j-api:2.0.13'
api 'org.slf4j:slf4j-api:2.0.16'
}

description = "The core module is the base library, with common interfaces and utilities used throughout the rest of the modules."
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ dependencies {

implementation 'org.bouncycastle:bcpkix-jdk15to18:1.78.1'

implementation 'org.hamcrest:hamcrest:2.2'
implementation 'org.hamcrest:hamcrest-library:2.2'
implementation 'org.hamcrest:hamcrest:3.0'
implementation 'org.hamcrest:hamcrest-library:3.0'

implementation 'com.squareup.moshi:moshi:1.15.1'
}

0 comments on commit 1516cf6

Please sign in to comment.