octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5661 from BreadFish64/fix-bitrise 

Fix Bitrise build
This commit is contained in:
Marshall Mohror 2020-12-29 22:43:35 -06:00 committed by GitHub
parent 94013c8e00 b3915c23a0
commit 26e8b755f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bitrise.yml
View File

@ -42,8 +42,8 @@ workflows:
The next change in your repository that matches any of your trigger map event will start **deploy** workflow. The next change in your repository that matches any of your trigger map event will start **deploy** workflow.
steps: steps:
- cache-pull@2.0.1: {} - cache-pull@2.4.0: {}
- script@1.1.5: - script@1.1.6:
title: Install newer cmake title: Install newer cmake
inputs: inputs:
- content: |- - content: |-
@ -52,7 +52,7 @@ workflows:
sudo apt remove cmake -y sudo apt remove cmake -y
sudo apt purge --auto-remove cmake -y sudo apt purge --auto-remove cmake -y
sudo apt install ninja-build -y sudo apt install ninja-build -y
version=3.10 version=3.19
build=2 build=2
mkdir ~/temp mkdir ~/temp
cd ~/temp cd ~/temp
@ -60,13 +60,13 @@ workflows:
sudo mkdir /opt/cmake sudo mkdir /opt/cmake
sudo sh cmake-$version.$build-Linux-x86_64.sh --prefix=/opt/cmake --skip-license --exclude-subdir sudo sh cmake-$version.$build-Linux-x86_64.sh --prefix=/opt/cmake --skip-license --exclude-subdir
envman add --key PATH --value "/opt/cmake/bin:$PATH" envman add --key PATH --value "/opt/cmake/bin:$PATH"
- install-missing-android-tools@2.3.3: - install-missing-android-tools@2.3.8:
inputs: inputs:
- gradlew_path: "$PROJECT_LOCATION/gradlew" - gradlew_path: "$PROJECT_LOCATION/gradlew"
- change-android-versioncode-and-versionname@1.1.1: - change-android-versioncode-and-versionname@1.1.1:
inputs: inputs:
- build_gradle_path: "$PROJECT_LOCATION/$MODULE/build.gradle" - build_gradle_path: "$PROJECT_LOCATION/$MODULE/build.gradle"
- android-lint@0.9.5: - android-lint@0.9.8:
inputs: inputs:
- project_location: "$PROJECT_LOCATION" - project_location: "$PROJECT_LOCATION"
- module: "$MODULE" - module: "$MODULE"
@ -76,19 +76,19 @@ workflows:
- project_location: "$PROJECT_LOCATION" - project_location: "$PROJECT_LOCATION"
- module: "$MODULE" - module: "$MODULE"
- variant: "$TEST_VARIANT" - variant: "$TEST_VARIANT"
- android-build@0.9.5: - android-build@0.10.3:
inputs: inputs:
- project_location: "$PROJECT_LOCATION" - project_location: "$PROJECT_LOCATION"
- module: "$MODULE" - module: "$MODULE"
- variant: "$BUILD_VARIANT" - variant: "$BUILD_VARIANT"
- sign-apk@1.2.3: - sign-apk@1.2.3:
run_if: '{{getenv "BITRISEIO_ANDROID_KEYSTORE_URL" | ne ""}}' run_if: '{{getenv "BITRISEIO_ANDROID_KEYSTORE_URL" | ne ""}}'
- deploy-to-bitrise-io@1.3.18: {} - deploy-to-bitrise-io@1.11.1: {}
- cache-push@2.0.5: {} - cache-push@2.4.1: {}
primary: primary:
steps: steps:
- cache-pull@2.0.1: {} - cache-pull@2.4.0: {}
- script@1.1.5: - script@1.1.6:
title: Install newer cmake title: Install newer cmake
inputs: inputs:
- content: |- - content: |-
@ -97,7 +97,7 @@ workflows:
sudo apt remove cmake -y sudo apt remove cmake -y
sudo apt purge --auto-remove cmake -y sudo apt purge --auto-remove cmake -y
sudo apt install ninja-build -y sudo apt install ninja-build -y
version=3.10 version=3.19
build=2 build=2
mkdir ~/temp mkdir ~/temp
cd ~/temp cd ~/temp
@ -105,20 +105,20 @@ workflows:
sudo mkdir /opt/cmake sudo mkdir /opt/cmake
sudo sh cmake-$version.$build-Linux-x86_64.sh --prefix=/opt/cmake --skip-license --exclude-subdir sudo sh cmake-$version.$build-Linux-x86_64.sh --prefix=/opt/cmake --skip-license --exclude-subdir
envman add --key PATH --value "/opt/cmake/bin:$PATH" envman add --key PATH --value "/opt/cmake/bin:$PATH"
- install-missing-android-tools@2.3.3: - install-missing-android-tools@2.3.8:
inputs: inputs:
- gradlew_path: "$PROJECT_LOCATION/gradlew" - gradlew_path: "$PROJECT_LOCATION/gradlew"
- android-lint@0.9.5: - android-lint@0.9.8:
inputs: inputs:
- project_location: "$PROJECT_LOCATION" - project_location: "$PROJECT_LOCATION"
- module: "$MODULE" - module: "$MODULE"
- variant: "$TEST_VARIANT" - variant: "$TEST_VARIANT"
- android-build@0.9.5: - android-build@0.10.3:
inputs: inputs:
- variant: Debug - variant: Debug
- project_location: "$PROJECT_LOCATION" - project_location: "$PROJECT_LOCATION"
- deploy-to-bitrise-io@1.3.18: {} - deploy-to-bitrise-io@1.11.1: {}
- cache-push@2.0.5: {} - cache-push@2.4.1: {}
app: app:
envs: envs:
- opts: - opts:

2
src/android/build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.android.tools.build:gradle:4.0.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

4
src/android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Fri Nov 09 14:15:11 CST 2018 #Tue Dec 29 13:07:24 CST 2020
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip