Skip to content

Commit

Permalink
Upgrade camera and API libraries / plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
AbandonedCart committed Jan 14, 2024
1 parent 7a0a1bc commit ece2853
Show file tree
Hide file tree
Showing 5 changed files with 105,143 additions and 106,260 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
keyPassword: "hiddenramblings"
env:
# override default build-tools version (29.0.3) -- optional
BUILD_TOOLS_VERSION: "30.0.2"
BUILD_TOOLS_VERSION: "34.0.0"

- uses: actions/upload-artifact@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wearos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
keyPassword: "hiddenramblings"
env:
# override default build-tools version (29.0.3) -- optional
BUILD_TOOLS_VERSION: "30.0.2"
BUILD_TOOLS_VERSION: "34.0.0"

- uses: actions/upload-artifact@v3
with:
Expand Down
18 changes: 9 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ android {
compileSdk 34
minSdk 19
targetSdk 34
versionName "4.1.4"
versionName "4.1.5"
versionCode = versionName.replace(".","").toInteger() * 10

vectorDrawables {
Expand Down Expand Up @@ -110,21 +110,21 @@ android {
}

dependencies {
implementation 'androidx.activity:activity-ktx:1.8.1'
implementation 'androidx.activity:activity-ktx:1.8.2'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation "androidx.browser:browser:1.7.0"
implementation 'androidx.camera:camera-core:1.3.0'
implementation 'androidx.camera:camera-camera2:1.3.0'
implementation 'androidx.camera:camera-lifecycle:1.3.0'
implementation 'androidx.camera:camera-view:1.3.0'
implementation 'androidx.camera:camera-core:1.3.1'
implementation 'androidx.camera:camera-camera2:1.3.1'
implementation 'androidx.camera:camera-lifecycle:1.3.1'
implementation 'androidx.camera:camera-view:1.3.1'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.core:core-splashscreen:1.0.1'
implementation 'androidx.fragment:fragment-ktx:1.6.2'
implementation 'androidx.preference:preference-ktx:1.2.1'
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'androidx.webkit:webkit:1.8.0'
implementation 'androidx.webkit:webkit:1.9.0'
wearosImplementation "androidx.wear:wear:1.3.0"

implementation 'com.android.billingclient:billing:6.1.0'
Expand All @@ -136,8 +136,8 @@ dependencies {

implementation 'com.google.android.flexbox:flexbox:3.0.0'
// Required for Lollipop Amiibo API download compatibility
implementation 'com.google.android.gms:play-services-basement:18.2.0'
implementation 'com.google.android.material:material:1.9.0'
implementation 'com.google.android.gms:play-services-basement:18.3.0'
implementation 'com.google.android.material:material:1.11.0'
implementation 'com.google.android.play:core:1.10.3'
// implementation 'com.google.android.gms:play-services-mlkit-barcode-scanning:18.1.0'
implementation 'com.google.mlkit:barcode-scanning:17.2.0'
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/raw/amiibo.json
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@
},
"0x0189000100ab0502":
{
"name": "Label",
"name": "Labelle",
"release":
{
"au": "2015-11-21",
Expand Down Expand Up @@ -916,7 +916,7 @@
},
"0x03a8000100910502":
{
"name": "Rosco",
"name": "Roscoe",
"release":
{
"au": "2015-10-03",
Expand Down Expand Up @@ -9886,7 +9886,7 @@
"0x0463": "Friga",
"0x0462": "Hopper",
"0x03a9": "Winnie",
"0x03a8": "Rosco",
"0x03a8": "Roscoe",
"0x0a13": "Tiansheng",
"0x0a12": "Ione",
"0x03a7": "Elmer",
Expand Down
Loading

0 comments on commit ece2853

Please sign in to comment.