upgrade libwebrtc to m85

* fetched from 23ed0ce2ad
This commit is contained in:
Christian Schneppe 2020-09-26 14:45:24 +02:00
parent fb268fb3bf
commit 22d4efdd5f
No known key found for this signature in database
GPG key ID: F30B8D686B44D87E
2 changed files with 6 additions and 6 deletions

View file

@ -8,7 +8,7 @@ jobs:
- restore_cache:
key: gradle-{{ checksum "build.gradle" }}-{{ checksum ".circleci/config.yml" }}
- run: export GRADLE_USER_HOME=$PWD/.gradle
- run: wget -O libs/libwebrtc-m84.aar https://www.pix-art.de/files/libwebrtc-m84.aar
- run: wget -O libs/libwebrtc-m85.aar https://www.pix-art.de/files/libwebrtc-m85.aar
- run: echo y | sdkmanager "platforms;android-$(sed -n 's,.*compileSdkVersion\s*\([0-9][0-9]*\).*,\1,p' build.gradle)" > /dev/null
- run: ./gradlew lintGitDebug
- save_cache:
@ -27,7 +27,7 @@ jobs:
- restore_cache:
key: android
- run: export GRADLE_USER_HOME=$PWD/.gradle
- run: wget -O libs/libwebrtc-m84.aar https://www.pix-art.de/files/libwebrtc-m84.aar
- run: wget -O libs/libwebrtc-m85.aar https://www.pix-art.de/files/libwebrtc-m85.aar
- run: echo y | sdkmanager "platforms;android-$(sed -n 's,.*compileSdkVersion\s*\([0-9][0-9]*\).*,\1,p' build.gradle)" > /dev/null
# build
- run: ./gradlew assembleGit
@ -46,7 +46,7 @@ jobs:
- restore_cache:
key: android
- run: export GRADLE_USER_HOME=$PWD/.gradle
- run: wget -O libs/libwebrtc-m84.aar https://www.pix-art.de/files/libwebrtc-m84.aar
- run: wget -O libs/libwebrtc-m85.aar https://www.pix-art.de/files/libwebrtc-m85.aar
- run: echo y | sdkmanager "platforms;android-$(sed -n 's,.*compileSdkVersion\s*\([0-9][0-9]*\).*,\1,p' build.gradle)" > /dev/null
# workaround for fdroid nightly circleci bug
- run: sed -i "s/os.getenv('CIRCLE_REPOSITORY_URL')/\"https:\/\/github.com\/kriztan\/Pix-Art-Messenger\"/" /usr/lib/python3/dist-packages/fdroidserver/nightly.py

View file

@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.2'
classpath 'com.android.tools.build:gradle:4.0.1'
}
}
@ -38,7 +38,7 @@ configurations {
dependencies {
implementation project(':libs:android-transcoder')
playstoreImplementation('com.google.firebase:firebase-messaging:20.1.3') {
playstoreImplementation('com.google.firebase:firebase-messaging:20.1.3') { ///higher versions are causing crashes due to missing project IDs
exclude group: 'com.google.firebase', module: 'firebase-core'
exclude group: 'com.google.firebase', module: 'firebase-analytics'
exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
@ -87,7 +87,7 @@ dependencies {
implementation 'com.squareup.retrofit2:converter-gson:2.6.4'
implementation 'com.google.guava:guava:28.2-android'
implementation 'com.github.AppIntro:AppIntro:6.0.0'
implementation fileTree(include: ['libwebrtc-m84.aar'], dir: 'libs')
implementation fileTree(include: ['libwebrtc-m85.aar'], dir: 'libs')
}
ext {