diff --git a/metadata/im.vector.app.yml b/metadata/im.vector.app.yml index 9eb382c700..e67dea5f23 100644 --- a/metadata/im.vector.app.yml +++ b/metadata/im.vector.app.yml @@ -52,24 +52,6 @@ Builds: - sed -i -e 's/enable true/enable false/g' build.gradle ndk: r21d - - versionName: 1.0.1 - versionCode: 40100010 - disable: beta - commit: v1.0.1 - subdir: vector - gradle: - - fdroid - srclibs: - - piasy@v1.6.2 - prebuild: - - tac ../build.gradle | awk '/dl.bintray.com\/piasy\/maven/{getline;$0="mavenLocal - {"}{print $0}' | tac > ../build.gradle.new - - mv ../build.gradle.new ../build.gradle - - sed -i -e '/com.google.firebase/,+5d' build.gradle - - sed -i -e '/com.google.gms.google-services/d' build.gradle - - sed -i -e 's/enable true/enable false/g' build.gradle - ndk: r21d - - versionName: 1.0.2 versionCode: 40100020 commit: v1.0.2 @@ -314,26 +296,6 @@ Builds: - build.gradle ndk: r21d - - versionName: 1.1.0 - versionCode: 40101000 - disable: contains gms through jitsi sdk - commit: v1.1.0 - subdir: vector - gradle: - - fdroid - srclibs: - - piasy@v1.6.2 - prebuild: - - tac ../build.gradle | awk '/dl.bintray.com\/piasy\/maven/{getline;$0="mavenLocal - {"}{print $0}' | tac > ../build.gradle.new - - mv ../build.gradle.new ../build.gradle - - sed -i -e '/com.google.firebase/,+5d' build.gradle - - sed -i -e '/com.google.gms.google-services/d' build.gradle - - sed -i -e 's/enable true/enable false/g' build.gradle - scanignore: - - build.gradle - ndk: r21d - - versionName: 1.1.3 versionCode: 40101030 commit: v1.1.3 @@ -688,7 +650,7 @@ Builds: - sysctl fs.inotify.max_user_watches=524288 - sysctl -p patch: - - build_gradle_remove_jitsi_repo.patch + - build_gradle_remove_jitsi_repo_40103100.patch gradle: - fdroid srclibs: @@ -720,7 +682,7 @@ Builds: - sysctl fs.inotify.max_user_watches=524288 - sysctl -p patch: - - build_gradle_remove_jitsi_repo.patch + - build_gradle_remove_jitsi_repo_40103100.patch gradle: - fdroid srclibs: @@ -741,176 +703,9 @@ Builds: - cp -r node_modules/jsc-android/dist/org/webkit/android-jsc "$HOME/.m2/repository/org/webkit" ndk: r21d - - versionName: 1.3.18 - versionCode: 40103180 - disable: https://github.com/vector-im/element-android/issues/6100 - commit: v1.3.18 - subdir: vector - sudo: - - apt-get update || apt-get update - - apt-get install -y -t stretch-backports npm jq openjdk-11-jdk-headless openjdk-11-jre-headless - - update-alternatives --auto java - - sysctl fs.inotify.max_user_watches=524288 - - sysctl -p - patch: - - build_gradle_remove_jitsi_repo.patch - gradle: - - fdroid - srclibs: - - jitsi-meet@android-sdk-3.10.0 - prebuild: - - sed -i -e '/com.google.gms.google-services/d' build.gradle ../build.gradle - - sed -i -e 's/enable true/enable false/g' build.gradle - - sed -i -e '/repositories {/a\ mavenLocal()' ../build.gradle - - sed -i -e '/gplayImplementation(.*) {/,/}/d; /gplayImplementation/d' build.gradle - build: - - cd $$jitsi-meet$$ - - export LIBRE_BUILD=true - - npm install webpack-bundle-analyzer - - npm install - - mkdir -p "$HOME/.m2" - - bash android/scripts/release-sdk.sh "$HOME/.m2/repository" - - mkdir -p "$HOME/.m2/repository/org/webkit" - - cp -r node_modules/jsc-android/dist/org/webkit/android-jsc "$HOME/.m2/repository/org/webkit" - ndk: r21d - - - versionName: 1.4.0 - versionCode: 40104000 - disable: https://github.com/vector-im/element-android/issues/6100 - commit: v1.4.0 - subdir: vector - sudo: - - apt-get update || apt-get update - - apt-get install -y -t stretch-backports npm jq openjdk-11-jdk-headless openjdk-11-jre-headless - - update-alternatives --auto java - - sysctl fs.inotify.max_user_watches=524288 - - sysctl -p - patch: - - build_gradle_remove_jitsi_repo.patch - gradle: - - fdroid - srclibs: - - jitsi-meet@android-sdk-3.10.0 - prebuild: - - sed -i -e 's/-Xmx\d+\w/-Xmx4g/g' ../gradle.properties - - sed -i -e '/com.google.gms.google-services/d' build.gradle ../build.gradle - - sed -i -e 's/enable true/enable false/g' build.gradle - - sed -i -e '/repositories {/a\ mavenLocal()' ../build.gradle - - sed -i -e '/gplayImplementation(.*) {/,/}/d; /gplayImplementation/d' build.gradle - build: - - cd $$jitsi-meet$$ - - export LIBRE_BUILD=true - - npm install webpack-bundle-analyzer - - npm install - - mkdir -p "$HOME/.m2" - - bash android/scripts/release-sdk.sh "$HOME/.m2/repository" - - mkdir -p "$HOME/.m2/repository/org/webkit" - - cp -r node_modules/jsc-android/dist/org/webkit/android-jsc "$HOME/.m2/repository/org/webkit" - ndk: r21d - - - versionName: 1.4.2 - versionCode: 40104020 - disable: https://github.com/vector-im/element-android/issues/6100 - commit: v1.4.2 - subdir: vector - sudo: - - apt-get update || apt-get update - - apt-get install -y -t stretch-backports npm jq openjdk-11-jdk-headless openjdk-11-jre-headless - - update-alternatives --auto java - - sysctl fs.inotify.max_user_watches=524288 - - sysctl -p - patch: - - build_gradle_remove_jitsi_repo.patch - gradle: - - fdroid - srclibs: - - jitsi-meet@android-sdk-3.10.0 - prebuild: - - sed -i -e '/com.google.gms.google-services/d' build.gradle ../build.gradle - - sed -i -e 's/enable true/enable false/g' build.gradle - - sed -i -e '/repositories {/a\ mavenLocal()' ../build.gradle - - sed -i -e '/gplayImplementation(.*) {/,/}/d; /gplayImplementation/d' build.gradle - build: - - cd $$jitsi-meet$$ - - export LIBRE_BUILD=true - - npm install webpack-bundle-analyzer - - npm install - - mkdir -p "$HOME/.m2" - - bash android/scripts/release-sdk.sh "$HOME/.m2/repository" - - mkdir -p "$HOME/.m2/repository/org/webkit" - - cp -r node_modules/jsc-android/dist/org/webkit/android-jsc "$HOME/.m2/repository/org/webkit" - ndk: r21d - - - versionName: 1.4.4 - versionCode: 40104040 - disable: https://github.com/vector-im/element-android/issues/6100 - commit: v1.4.4 - subdir: vector - sudo: - - apt-get update || apt-get update - - apt-get install -y -t stretch-backports npm jq openjdk-11-jdk-headless openjdk-11-jre-headless - - update-alternatives --auto java - - sysctl fs.inotify.max_user_watches=524288 - - sysctl -p - patch: - - build_gradle_remove_jitsi_repo.patch - gradle: - - fdroid - srclibs: - - jitsi-meet@android-sdk-3.10.0 - prebuild: - - sed -i -e '/com.google.gms.google-services/d' build.gradle ../build.gradle - - sed -i -e 's/enable true/enable false/g' build.gradle - - sed -i -e '/repositories {/a\ mavenLocal()' ../build.gradle - - sed -i -e '/gplayImplementation(.*) {/,/}/d; /gplayImplementation/d' build.gradle - build: - - cd $$jitsi-meet$$ - - export LIBRE_BUILD=true - - npm install webpack-bundle-analyzer - - npm install - - mkdir -p "$HOME/.m2" - - bash android/scripts/release-sdk.sh "$HOME/.m2/repository" - - mkdir -p "$HOME/.m2/repository/org/webkit" - - cp -r node_modules/jsc-android/dist/org/webkit/android-jsc "$HOME/.m2/repository/org/webkit" - ndk: r21d - - - versionName: 1.4.8 - versionCode: 40104080 - disable: https://github.com/vector-im/element-android/issues/6100 - commit: v1.4.8 - subdir: vector - sudo: - - apt-get update || apt-get update - - apt-get install -y -t stretch-backports npm jq openjdk-11-jdk-headless openjdk-11-jre-headless - - update-alternatives --auto java - - sysctl fs.inotify.max_user_watches=524288 - - sysctl -p - patch: - - build_gradle_remove_jitsi_repo.patch - gradle: - - fdroid - srclibs: - - jitsi-meet@android-sdk-3.10.0 - prebuild: - - sed -i -e '/com.google.gms.google-services/d' build.gradle ../build.gradle - - sed -i -e 's/enable true/enable false/g' build.gradle - - sed -i -e '/repositories {/a\ mavenLocal()' ../build.gradle - - sed -i -e '/gplayImplementation(.*) {/,/}/d; /gplayImplementation/d' build.gradle - build: - - cd $$jitsi-meet$$ - - export LIBRE_BUILD=true - - npm install webpack-bundle-analyzer - - npm install - - mkdir -p "$HOME/.m2" - - bash android/scripts/release-sdk.sh "$HOME/.m2/repository" - - mkdir -p "$HOME/.m2/repository/org/webkit" - - cp -r node_modules/jsc-android/dist/org/webkit/android-jsc "$HOME/.m2/repository/org/webkit" - ndk: r21d - - - versionName: 1.4.11 - versionCode: 40104110 - disable: https://github.com/vector-im/element-android/issues/6100 - commit: v1.4.11 + - versionName: 1.4.19 + versionCode: 40104190 + commit: v1.4.19 subdir: vector sudo: - curl -Lo node.tar.xz https://nodejs.org/dist/v16.14.2/node-v16.14.2-linux-x64.tar.xz @@ -923,81 +718,7 @@ Builds: - sysctl fs.inotify.max_user_watches=524288 - sysctl -p patch: - - build_gradle_remove_jitsi_repo.patch - gradle: - - fdroid - srclibs: - - jitsi-meet@android-sdk-5.0.2 - prebuild: - - sed -i -e '/com.google.gms.google-services/d' build.gradle ../build.gradle - - sed -i -e 's/enable true/enable false/g' build.gradle - - sed -i -e '/repositories {/a\ mavenLocal()' ../build.gradle - - sed -i -e '/gplayImplementation(.*) {/,/}/d; /gplayImplementation/d' build.gradle - build: - - cd $$jitsi-meet$$ - - export LIBRE_BUILD=true - - npm install --save false webpack-bundle-analyzer - - npm ci - - mkdir -p "$HOME/.m2" - - bash android/scripts/release-sdk.sh "$HOME/.m2/repository" - - mkdir -p "$HOME/.m2/repository/org/webkit" - - cp -r node_modules/jsc-android/dist/org/webkit/android-jsc "$HOME/.m2/repository/org/webkit" - ndk: r21d - - - versionName: 1.4.13 - versionCode: 40104130 - disable: https://github.com/vector-im/element-android/issues/6100 - commit: v1.4.13 - subdir: vector - sudo: - - curl -Lo node.tar.xz https://nodejs.org/dist/v16.14.2/node-v16.14.2-linux-x64.tar.xz - - echo "e40c6f81bfd078976d85296b5e657be19e06862497741ad82902d0704b34bb1b node.tar.xz" - | sha256sum -c - - - tar xJf node.tar.xz --strip-components=1 -C /usr/local/ - - apt-get update || apt-get update - - apt-get install -y -t stretch-backports jq openjdk-11-jdk-headless openjdk-11-jre-headless - - update-alternatives --auto java - - sysctl fs.inotify.max_user_watches=524288 - - sysctl -p - patch: - - build_gradle_remove_jitsi_repo.patch - gradle: - - fdroid - srclibs: - - jitsi-meet@android-sdk-5.0.2 - prebuild: - - sed -i -e '/com.google.gms.google-services/d' build.gradle ../build.gradle - - sed -i -e 's/enable true/enable false/g' build.gradle - - sed -i -e '/repositories {/a\ mavenLocal()' ../build.gradle - - sed -i -e '/gplayImplementation(.*) {/,/}/d; /gplayImplementation/d' build.gradle - build: - - cd $$jitsi-meet$$ - - export LIBRE_BUILD=true - - npm install --save false webpack-bundle-analyzer - - npm ci - - mkdir -p "$HOME/.m2" - - bash android/scripts/release-sdk.sh "$HOME/.m2/repository" - - mkdir -p "$HOME/.m2/repository/org/webkit" - - cp -r node_modules/jsc-android/dist/org/webkit/android-jsc "$HOME/.m2/repository/org/webkit" - ndk: r21d - - - versionName: 1.4.14 - versionCode: 40104140 - disable: https://github.com/vector-im/element-android/issues/6100 - commit: v1.4.14 - subdir: vector - sudo: - - curl -Lo node.tar.xz https://nodejs.org/dist/v16.14.2/node-v16.14.2-linux-x64.tar.xz - - echo "e40c6f81bfd078976d85296b5e657be19e06862497741ad82902d0704b34bb1b node.tar.xz" - | sha256sum -c - - - tar xJf node.tar.xz --strip-components=1 -C /usr/local/ - - apt-get update || apt-get update - - apt-get install -y -t stretch-backports jq openjdk-11-jdk-headless openjdk-11-jre-headless - - update-alternatives --auto java - - sysctl fs.inotify.max_user_watches=524288 - - sysctl -p - patch: - - build_gradle_remove_jitsi_repo.patch + - build_gradle_remove_jitsi_repo_40104160.patch gradle: - fdroid srclibs: @@ -1026,5 +747,5 @@ MaintainerNotes: Do not update unless requested by the Element team! The Element AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 1.4.14 -CurrentVersionCode: 40104140 +CurrentVersion: 1.4.19 +CurrentVersionCode: 40104190 diff --git a/metadata/im.vector.app/build_gradle_remove_jitsi_repo.patch b/metadata/im.vector.app/build_gradle_remove_jitsi_repo_40103100.patch similarity index 95% rename from metadata/im.vector.app/build_gradle_remove_jitsi_repo.patch rename to metadata/im.vector.app/build_gradle_remove_jitsi_repo_40103100.patch index e082d33da2..1f9ec6d993 100644 --- a/metadata/im.vector.app/build_gradle_remove_jitsi_repo.patch +++ b/metadata/im.vector.app/build_gradle_remove_jitsi_repo_40103100.patch @@ -6,7 +6,7 @@ } - // Jitsi repo - maven { -- url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-5.0.2" +- url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-3.10.0" - // Note: to test Jitsi release you can use a local file like this: - // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-3.10.0" - content { diff --git a/metadata/im.vector.app/build_gradle_remove_jitsi_repo_40104160.patch b/metadata/im.vector.app/build_gradle_remove_jitsi_repo_40104160.patch new file mode 100644 index 0000000000..a040b46e1c --- /dev/null +++ b/metadata/im.vector.app/build_gradle_remove_jitsi_repo_40104160.patch @@ -0,0 +1,19 @@ +--- a/build.gradle ++++ b/build.gradle +@@ -51,16 +51,6 @@ + groups.jitpack.group.each { includeGroup it } + } + } +- // Jitsi repo +- maven { +- url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-5.0.2" +- // Note: to test Jitsi release you can use a local file like this: +- // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-3.10.0" +- content { +- groups.jitsi.regex.each { includeGroupByRegex it } +- groups.jitsi.group.each { includeGroup it } +- } +- } + // Do not use `google()`, it prevents Dependabot from working properly + google { + url 'https://maven.google.com'