Skip to content

Commit

Permalink
Merge branch 'vvb2060:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
igormiguell authored Jan 12, 2025
2 parents f7db08a + 7229a3d commit a379b15
Show file tree
Hide file tree
Showing 4 changed files with 255 additions and 84 deletions.
11 changes: 0 additions & 11 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,9 @@ jobs:
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
with:
dependency-graph: generate-and-submit
build-scan-publish: true
build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
build-scan-terms-of-use-agree: "yes"
- name: Initialize CodeQL
if: matrix.os == 'ubuntu-latest'
uses: github/codeql-action/init@v3
with:
languages: java-kotlin
build-mode: manual
dependency-caching: true
- name: Build with Gradle
shell: bash
run: |
Expand All @@ -45,6 +37,3 @@ jobs:
with:
name: ${{ matrix.os }}-artifact
path: app/build/outputs
- name: Perform CodeQL Analysis
if: matrix.os == 'ubuntu-latest'
uses: github/codeql-action/analyze@v3
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ android {
targetSdk = 35
versionCode = gitCommitCount
versionName = '1.8.3'
resourceConfigurations += ['en', 'zh-rCN', 'pt-rBR']
resourceConfigurations += ['en', 'zh-rCN', 'zh-rTW', 'pt-rBR']
optimization {
keepRules {
ignoreFromAllExternalDependencies true
Expand Down Expand Up @@ -113,7 +113,7 @@ dependencies {
compileOnly project(':stub')

implementation 'org.bouncycastle:bcprov-jdk18on:1.79'
implementation 'com.google.guava:guava:33.3.0-android'
implementation 'com.google.guava:guava:33.4.0-android'
implementation 'co.nstant.in:cbor:0.9'

//noinspection GradleDependency
Expand Down
Loading

0 comments on commit a379b15

Please sign in to comment.