Skip to content

Commit

Permalink
Merge PR #138
Browse files Browse the repository at this point in the history
  • Loading branch information
AdamVe committed Jun 14, 2024
2 parents 27f9329 + 9a942a8 commit bf4f25f
Show file tree
Hide file tree
Showing 13 changed files with 36 additions and 37 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
Expand All @@ -19,7 +19,7 @@ jobs:
run: NO_GPG_SIGN=true ./gradlew --stacktrace check test build javadocJar publishToMavenLocal

- name: Upload jars
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: maven-repo
path: ~/.m2/repository/com/yubico/yubikit/
10 changes: 5 additions & 5 deletions .github/workflows/scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'

- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
15 changes: 6 additions & 9 deletions .github/workflows/spotbugs-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@ name: "SpotBugs"

on:
push:
branches:
- main
- adamve/spotbugs-reports-v3
branches: [ main ]
pull_request:
branches:
- main
- adamve/spotbugs-reports-v3
# The branches below must be a subset of the branches above
branches: [ main ]
schedule:
- cron: "25 16 * * 0"

Expand All @@ -30,10 +27,10 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: "17"
Expand Down Expand Up @@ -69,7 +66,7 @@ jobs:
done
- name: upload SARIF
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: build/spotbugs/
category: spotbugs-analysis
12 changes: 7 additions & 5 deletions AndroidDemo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,18 @@ dependencies {

implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'

implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.fragment:fragment-ktx:1.6.2'
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.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'com.google.android.material:material:1.11.0'
implementation 'com.google.android.material:material:1.12.0'

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

// Navigation
Expand All @@ -76,7 +78,7 @@ dependencies {
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
implementation "androidx.navigation:navigation-dynamic-features-fragment:$nav_version"

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

implementation 'com.github.tony19:logback-android:3.0.0'

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

compileOnly 'androidx.annotation:annotation:1.7.1'
compileOnly 'androidx.annotation:annotation:1.8.0'

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

androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test:runner:1.5.2'
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.23'
kotlin_version = '1.9.24'
}
repositories {
mavenCentral()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.3.1'
classpath 'com.android.tools.build:gradle:8.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ repositories {
}

dependencies {
implementation 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.8'
implementation 'com.android.tools.build:gradle:8.3.1'
implementation 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.16'
implementation 'com.android.tools.build:gradle:8.4.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.9'
implementation 'org.slf4j:slf4j-api:2.0.13'
}
6 changes: 3 additions & 3 deletions buildSrc/src/main/groovy/project-convention-spotbugs.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ plugins {
}

dependencies {
spotbugs 'com.github.spotbugs:spotbugs:4.8.3'
spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.12.0'
spotbugs 'com.github.spotbugs:spotbugs:4.8.5'
spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.13.0'

compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
compileOnly 'com.github.spotbugs:spotbugs-annotations:4.8.3'
compileOnly 'com.github.spotbugs:spotbugs-annotations:4.8.5'

testImplementation 'com.google.code.findbugs:jsr305:3.0.2'
}
Expand Down
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.9'
api 'org.slf4j:slf4j-api:2.0.13'
}

description = "The core module is the base library, with common interfaces and utilities used throughout the rest of the modules."
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 @@
#Mon Mar 18 13:20:18 CET 2024
#Wed Jun 05 15:43:52 CEST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion testing-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies {
api project(':piv')
api project(':testing')

implementation 'com.google.android.material:material:1.11.0'
implementation 'com.google.android.material:material:1.12.0'

implementation 'androidx.multidex:multidex:2.0.1'

Expand Down
2 changes: 1 addition & 1 deletion testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies {

api 'junit:junit:4.13.2'

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

implementation 'org.hamcrest:hamcrest:2.2'
implementation 'org.hamcrest:hamcrest-library:2.2'
Expand Down

0 comments on commit bf4f25f

Please sign in to comment.