Skip to content

Commit

Permalink
Merge branch 'zoff99/dev003' of https://github.com/zoff99/ToxAndroidR…
Browse files Browse the repository at this point in the history
…efImpl into zoff99/dev003
  • Loading branch information
zoff99 committed Feb 22, 2024
2 parents b27b78f + 9d46610 commit 61809d0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions android-refimpl-app/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,10 @@ dependencies {
implementation('com.mikepenz:google-material-typeface:3.0.1.3.original@aar') {
exclude group: 'com.android.support'
}
implementation('com.mikepenz:fontawesome-typeface:5.3.1.1@aar') {
implementation('com.mikepenz:fontawesome-typeface:5.13.3.0-kotlin@aar') {
exclude group: 'com.android.support'
}
implementation('com.mikepenz:material-design-iconic-typeface:2.2.0.5@aar') {
implementation('com.mikepenz:material-design-iconic-typeface:2.2.0.8-kotlin@aar') {
exclude group: 'com.android.support'
}
implementation('com.google.zxing:core:3.5.2') {
Expand Down Expand Up @@ -420,7 +420,7 @@ dependencies {
// ---------------------
// CameraX dependencies
implementation "androidx.camera:camera-lifecycle:1.3.0"
implementation 'androidx.camera:camera-camera2:1.3.0'
implementation 'androidx.camera:camera-camera2:1.3.1'
implementation 'androidx.camera:camera-view:1.3.0'
implementation 'androidx.camera:camera-extensions:1.3.0'
//
Expand Down
2 changes: 1 addition & 1 deletion android-refimpl-app/orma_processor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ sourceCompatibility = JavaVersion.VERSION_1_8

dependencies {
implementation('com.github.zoff99:pkgs_maskaradeOrma-annotations:6.0.2')
compileOnly "androidx.annotation:annotation:1.1.0"
compileOnly "androidx.annotation:annotation:1.7.1"
implementation 'com.squareup:javapoet:1.11.1'
}

0 comments on commit 61809d0

Please sign in to comment.