Skip to content

Commit

Permalink
bump dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jameshnsears committed Oct 20, 2023
1 parent f61d229 commit b29dc80
Show file tree
Hide file tree
Showing 12 changed files with 77 additions and 59 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/coverage-androidTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

steps:
- name: clone
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:

steps:
- name: clone
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/coverage-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

steps:
- name: clone
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:

steps:
- name: clone
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis-sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: macOS-latest
steps:
- name: clone
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
runs-on: macOS-latest
steps:
- name: clone
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
runs-on: macOS-latest
steps:
- name: clone
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
runs-on: macOS-latest
steps:
- name: clone
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand Down
17 changes: 17 additions & 0 deletions .idea/deploymentTargetDropDown.xml

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

2 changes: 1 addition & 1 deletion .idea/gradle.xml

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

3 changes: 2 additions & 1 deletion .idea/misc.xml

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

62 changes: 31 additions & 31 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
id 'com.google.firebase.crashlytics'
id 'kotlin-android'
id "io.gitlab.arturbosch.detekt" version "1.23.0"
id "org.jlleitschuh.gradle.ktlint" version "11.4.0"
id "org.jlleitschuh.gradle.ktlint" version "11.6.1"
id 'com.diffplug.spotless'
id 'org.jetbrains.kotlin.android'
}
Expand Down Expand Up @@ -177,11 +177,11 @@ android {
}

dependencies {
androidTestImplementation 'androidx.activity:activity-compose:1.7.2'
androidTestImplementation 'androidx.compose.foundation:foundation:1.4.3'
androidTestImplementation 'androidx.compose.material3:material3:1.1.1'
androidTestImplementation 'androidx.compose.material3:material3-window-size-class:1.1.1'
androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.4.3'
androidTestImplementation 'androidx.activity:activity-compose:1.8.0'
androidTestImplementation 'androidx.compose.foundation:foundation:1.5.4'
androidTestImplementation 'androidx.compose.material3:material3:1.1.2'
androidTestImplementation 'androidx.compose.material3:material3-window-size-class:1.1.2'
androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.5.4'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.ext:truth:1.5.0'
Expand All @@ -191,46 +191,46 @@ dependencies {
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
androidTestImplementation 'com.squareup.okhttp3:mockwebserver:5.0.0-alpha.11'
androidTestImplementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'
androidTestImplementation 'io.mockk:mockk-android:1.13.5'
androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.2'
androidTestImplementation 'io.mockk:mockk-android:1.13.8'
androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
androidTestImplementation 'junit:junit:4.13.2'

debugImplementation 'androidx.compose.ui:ui-test-manifest:1.4.3'
debugImplementation 'androidx.compose.ui:ui-test-manifest:1.5.4'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'

implementation 'androidx.activity:activity-compose:1.7.2'
implementation 'androidx.activity:activity-ktx:1.7.2'
implementation 'androidx.compose.compiler:compiler:1.4.8'
implementation 'androidx.compose.foundation:foundation:1.4.3'
implementation 'androidx.compose.material3:material3:1.1.1'
implementation 'androidx.compose.material3:material3-window-size-class:1.1.1'
implementation 'androidx.compose.material:material-icons-extended:1.4.3'
implementation 'androidx.compose.runtime:runtime-livedata:1.4.3'
implementation 'androidx.compose.ui:ui:1.4.3'
implementation 'androidx.compose.ui:ui-tooling:1.4.3'
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.activity:activity-compose:1.8.0'
implementation 'androidx.activity:activity-ktx:1.8.0'
implementation 'androidx.compose.compiler:compiler:1.5.3'
implementation 'androidx.compose.foundation:foundation:1.5.4'
implementation 'androidx.compose.material3:material3:1.1.2'
implementation 'androidx.compose.material3:material3-window-size-class:1.1.2'
implementation 'androidx.compose.material:material-icons-extended:1.5.4'
implementation 'androidx.compose.runtime:runtime-livedata:1.5.4'
implementation 'androidx.compose.ui:ui:1.5.4'
implementation 'androidx.compose.ui:ui-tooling:1.5.4'
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.datastore:datastore-preferences:1.0.0'
implementation 'androidx.exifinterface:exifinterface:1.3.6'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1'
implementation 'androidx.navigation:navigation-compose:2.6.0'
implementation 'com.google.android.material:material:1.9.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2'
implementation 'androidx.navigation:navigation-compose:2.7.4'
implementation 'com.google.android.material:material:1.10.0'
implementation 'com.google.firebase:firebase-analytics:21.3.0'
implementation 'com.jakewharton.timber:timber:5.0.1'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'io.coil-kt:coil-compose:2.4.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.2'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2'
implementation platform('com.google.firebase:firebase-bom:32.1.1')
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
implementation platform('com.google.firebase:firebase-bom:32.3.1')
implementation project(path: ':module:common')
implementation project(path: ':module:opencv')
implementation project(path: ':module:permissions')

testImplementation 'com.google.truth:truth:1.1.5'
testImplementation 'com.jakewharton.timber:timber:5.0.1'
testImplementation 'org.hamcrest:hamcrest:2.2'
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-debug:1.7.2'
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.3'
testImplementation 'org.junit.vintage:junit-vintage-engine:5.9.3'
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-debug:1.7.3'
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
testImplementation 'org.junit.vintage:junit-vintage-engine:5.10.0'
}
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.google.gms:google-services:4.3.15'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
classpath 'org.jacoco:org.jacoco.core:0.8.10'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21'
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.2.1.3168'
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.19.0'
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.4.1.3373'
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.22.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
6 changes: 3 additions & 3 deletions module/common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id 'com.android.library'
id 'org.jetbrains.kotlin.android'
id "io.gitlab.arturbosch.detekt" version "1.23.0"
id "org.jlleitschuh.gradle.ktlint" version "11.4.0"
id "org.jlleitschuh.gradle.ktlint" version "11.6.1"
}

apply from: '../../detekt.gradle'
Expand Down Expand Up @@ -72,8 +72,8 @@ android {
}

dependencies {
implementation 'androidx.annotation:annotation:1.6.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.annotation:annotation:1.7.0'
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'com.jakewharton.timber:timber:5.0.1'
implementation fileTree(dir: 'libs', include: ['*.jar'])
}
2 changes: 1 addition & 1 deletion module/opencv/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ android {
}

dependencies {
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.core:core-ktx:1.12.0'
}
20 changes: 10 additions & 10 deletions module/permissions/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id 'com.android.library'
id 'org.jetbrains.kotlin.android'
id "io.gitlab.arturbosch.detekt" version "1.23.0"
id "org.jlleitschuh.gradle.ktlint" version "11.4.0"
id "org.jlleitschuh.gradle.ktlint" version "11.6.1"
}

apply from: '../../jacoco.gradle'
Expand Down Expand Up @@ -91,21 +91,21 @@ android {
}

dependencies {
androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.4.3'
androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.5.4'
androidTestImplementation 'androidx.test:rules:1.5.0'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'

debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'

implementation 'androidx.activity:activity-compose:1.7.2'
implementation 'androidx.compose.foundation:foundation:1.4.3'
implementation 'androidx.compose.material3:material3:1.1.1'
implementation 'androidx.compose.material:material-icons-extended:1.4.3'
implementation 'androidx.compose.runtime:runtime-livedata:1.4.3'
implementation 'androidx.compose.ui:ui:1.4.3'
implementation 'androidx.compose.ui:ui-tooling:1.4.3'
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.activity:activity-compose:1.8.0'
implementation 'androidx.compose.foundation:foundation:1.5.4'
implementation 'androidx.compose.material3:material3:1.1.2'
implementation 'androidx.compose.material:material-icons-extended:1.5.4'
implementation 'androidx.compose.runtime:runtime-livedata:1.5.4'
implementation 'androidx.compose.ui:ui:1.5.4'
implementation 'androidx.compose.ui:ui-tooling:1.5.4'
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.datastore:datastore-preferences:1.0.0'
implementation 'com.jakewharton.timber:timber:5.0.1'
implementation fileTree(dir: 'libs', include: ['*.jar'])
Expand Down

0 comments on commit b29dc80

Please sign in to comment.