Fix codebase and bump dependencies

metabrainz · Oct 4, 2023 · c720779 · c720779
1 parent 072da3b
commit c720779
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 24 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -1,10 +1,10 @@
-name: ListenBrainz CI
+name: MusicBrainz CI
 
 on:
   push:
-    branches: [ main, dev, beta ]
+    branches: [ main, dev ]
   pull_request:
-    branches: [ main, dev, beta ]
+    branches: [ main, dev ]
 
 jobs:
   build:

diff --git a/.github/workflows/attach-release.yml b/.github/workflows/attach-release.yml
@@ -30,17 +30,11 @@ jobs:
           echo "keyAlias=$KEYSTORE_KEY_ALIAS" >> keystore.properties
           echo "storePassword=$KEYSTORE_STORE_PASSWORD" >> keystore.properties
           echo "keyPassword=$KEYSTORE_KEY_PASSWORD" >> keystore.properties
-          echo "sentryDsn=$SENTRY_DSN" >> keystore.properties
-          echo "youtubeApiKey=$YOUTUBE_API_KEY" >> keystore.properties
-          echo "spotifyClientId=$SPOTIFY_CLIENT_ID" >> keystore.properties
         env:
           ANDROID_KEYSTORE_FILE: ${{ secrets.ANDROID_KEYSTORE_FILE }}
           KEYSTORE_KEY_ALIAS: ${{ secrets.KEYSTORE_KEY_ALIAS }}
           KEYSTORE_KEY_PASSWORD: ${{ secrets.KEYSTORE_KEY_PASSWORD }}
           KEYSTORE_STORE_PASSWORD: ${{ secrets.KEYSTORE_STORE_PASSWORD }}
-          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-          YOUTUBE_API_KEY: ${{ secrets.YOUTUBE_API_KEY }}
-          SPOTIFY_CLIENT_ID: ${{ secrets.SPOTIFY_CLIENT_ID }}
 
       - name: Cache Gradle dependencies
         uses: actions/cache@v3

diff --git a/.github/workflows/releaseBeta.yml b/.github/workflows/releaseBeta.yml
@@ -50,6 +50,7 @@ jobs:
         run: |
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
+
       - name: Configure Keystore
         run: |
           echo "$ANDROID_KEYSTORE_FILE" > keystore.jks.b64

diff --git a/.github/workflows/releaseProd.yml b/.github/workflows/releaseProd.yml
@@ -52,6 +52,7 @@ jobs:
         run: |
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
+
       - name: Configure Keystore
         run: |
           echo "$ANDROID_KEYSTORE_FILE" > keystore.jks.b64

diff --git a/app/build.gradle b/app/build.gradle
@@ -66,10 +66,6 @@ android {
             resources.srcDirs += [sharedTestResourcesDir]
         }
     }
-    lint {
-        abortOnError false
-        disable 'MissingTranslation'
-    }
     composeOptions {
         kotlinCompilerExtensionVersion '1.4.6'
     }
@@ -88,7 +84,6 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.core:core-ktx:1.10.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'androidx.browser:browser:1.5.0'
     implementation 'androidx.recyclerview:recyclerview:1.3.0'

diff --git a/app/src/main/res/values-de(?!-rde)/strings.xml b/app/src/main/res/values-de(?!-rde)/strings.xml
diff --git a/app/src/main/res/values-hi(?!-rhi)/strings.xml b/app/src/main/res/values-hi(?!-rhi)/strings.xml
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -118,7 +118,6 @@
     <string name="directory_path_label">文件夹路径</string>
     <string name="select_button">选择</string>
     <string name="up_button">向上</string>
-    <string name="settings_language">语言</string>
     <string name="settings_use_language">只使用英语</string>
     <string name="settings_use_language_summary">本选项将忽略系统语言配置，并仅以英文显示所有用户界面。</string>
 

diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.android.tools.build:gradle:8.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         // NOTE: Do not place your application dependencies here; they belong