From c72077901d2893d68394da40416fc2d637938c5a Mon Sep 17 00:00:00 2001 From: Akshat Tiwari <51470769+akshaaatt@users.noreply.github.com> Date: Wed, 4 Oct 2023 12:22:53 +0200 Subject: [PATCH] Fix codebase and bump dependencies --- .github/workflows/android.yml | 6 +++--- .github/workflows/attach-release.yml | 6 ------ .github/workflows/releaseBeta.yml | 1 + .github/workflows/releaseProd.yml | 1 + app/build.gradle | 5 ----- app/src/main/res/values-de(?!-rde)/strings.xml | 2 -- app/src/main/res/values-hi(?!-rhi)/strings.xml | 6 ------ app/src/main/res/values-zh-rCN/strings.xml | 1 - build.gradle | 2 +- 9 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 app/src/main/res/values-de(?!-rde)/strings.xml delete mode 100644 app/src/main/res/values-hi(?!-rhi)/strings.xml diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 19408ec2..9258747e 100644 --- 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 index 2cd2aa9d..6a09b4a1 100644 --- 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 index bf3083ad..2aa1e8ed 100644 --- 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 index cf9afab4..2dedbdc5 100644 --- 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 index e4585200..3cfcc48c 100644 --- 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 deleted file mode 100644 index a6b3daec..00000000 --- a/app/src/main/res/values-de(?!-rde)/strings.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/values-hi(?!-rhi)/strings.xml b/app/src/main/res/values-hi(?!-rhi)/strings.xml deleted file mode 100644 index d3b9432e..00000000 --- a/app/src/main/res/values-hi(?!-rhi)/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - MusicBrainz खोजें - MusicBrainz डेटा का अन्वेषण करें - चिह्न बटन - \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ff3a9d71..7f4a9bcb 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -118,7 +118,6 @@ 文件夹路径 选择 向上 - 语言 只使用英语 本选项将忽略系统语言配置，并仅以英文显示所有用户界面。 diff --git a/build.gradle b/build.gradle index aa897d7f..5abd65bb 100644 --- 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