Skip to content

Commit

Permalink
Update all libraries, add babybuddy test version
Browse files Browse the repository at this point in the history
  • Loading branch information
MrApplejuice committed Sep 1, 2024
1 parent 34df8c8 commit 02b84b2
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
20 changes: 10 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ android {
namespace 'eu.pkgsoftware.babybuddywidgets'
}

ext.camerax_version = "1.3.2"
ext.camerax_version = "1.3.4"

dependencies {
implementation 'com.squareup.phrase:phrase:1.2.0'
Expand All @@ -115,24 +115,24 @@ dependencies {
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-jackson:2.9.0'

implementation 'com.fasterxml.jackson.core:jackson-core:2.9.10'
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.9.10'
implementation 'com.fasterxml.jackson.core:jackson-core:2.10.1'
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.10.1'
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.10'

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.11.0'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.concurrent:concurrent-futures:1.1.0'
implementation 'androidx.concurrent:concurrent-futures:1.2.0'

implementation "androidx.camera:camera-core:$camerax_version"
implementation "androidx.camera:camera-camera2:$camerax_version"
implementation "androidx.camera:camera-lifecycle:$camerax_version"
implementation "androidx.camera:camera-view:$camerax_version"

implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.core:core-ktx:1.13.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
Expand All @@ -142,9 +142,9 @@ dependencies {
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4"
testImplementation 'org.json:json:20230618'

androidTestImplementation 'androidx.test:core-ktx:1.5.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'androidx.test:core-ktx:1.6.1'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
androidTestImplementation 'tools.fastlane:screengrab:2.1.1'

implementation project(':zxing-cpp')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,11 @@ class MainActivity : AppCompatActivity() {
return super.dispatchTouchEvent(ev)
}

override fun dispatchKeyEvent(ev: KeyEvent?): Boolean {
ev?.let {
override fun dispatchKeyEvent(event: KeyEvent): Boolean {
event?.let {
invokeInputEventListeners(it)
}
return super.dispatchKeyEvent(ev)
return super.dispatchKeyEvent(event)
}

fun <X> storeActivity(
Expand Down
1 change: 1 addition & 0 deletions tools/babybuddy-version-array/versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
v2.6.0
v2.5.0
v2.3.0
v2.2.1
Expand Down

0 comments on commit 02b84b2

Please sign in to comment.