From 5651b5f09cf3736bfbbbb43f233bdfdcf8e8115b Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Wed, 5 Oct 2022 19:33:51 +0800
Subject: [PATCH] bangumi: 7.1.1

---
 metadata/com.czy0729.bangumi.yml | 142 ++-----------------------------
 1 file changed, 8 insertions(+), 134 deletions(-)

diff --git a/metadata/com.czy0729.bangumi.yml b/metadata/com.czy0729.bangumi.yml
index 7a5120d41b..5311bbad33 100644
--- a/metadata/com.czy0729.bangumi.yml
+++ b/metadata/com.czy0729.bangumi.yml
@@ -137,130 +137,6 @@ Builds:
       - mv $$react-native-reanimated$$/build/outputs/aar/android-release.aar ../../node_modules/react-native-reanimated/android/react-native-reanimated-$RN_MVER.aar
     ndk: r21e
 
-  - versionName: 6.6.0
-    versionCode: 60600
-    disable: https://github.com/czy0729/Bangumi/issues/41
-    commit: 43335bf1d3985761df37756634f19f35d45cfdf3
-    subdir: android/app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-      - sysctl fs.inotify.max_user_watches=524288
-      - 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/
-      - npm -g install yarn
-    init:
-      - cd ../..
-      - patch -p1 < patches/diff.patch
-      - yarn install
-    gradle:
-      - yes
-    srclibs:
-      - react-native-reanimated@2.1.0
-    rm:
-      - node_modules/expo-location
-    prebuild:
-      - mv ../gradle_yours.properties ../gradle.properties
-      - sed -i -e '/aliyun/d' -e '/bintray/d' ../build.gradle
-      - sed -i -e 's|../app.json|../../app.json|' -e '/enableSeparateBuild/d' -e '/signingConfigs.release/d'
-        build.gradle
-      - sed -i -e '/installreferrer/,+11d' ../../node_modules/react-native-device-info/android/build.gradle
-      - sed -i -e "s|files('libs/jcifs-1.3.18.jar')|'org.codelibs:jcifs:1.3.18.3'|"
-        ../../node_modules/react-native-smb/android/build.gradle
-      - sed -i -e '/function xhr/,/^}/s/^  .*//' ../../src/utils/track.ts
-      - sed -i -e '/baidu/d' ../../web/manga.html
-    scanignore:
-      - android/build.gradle
-      - node_modules/hermes-engine
-      - node_modules/react-native/android/com/facebook/react/react-native/*/
-      - node_modules/react-native-device-info/android/build.gradle
-      - node_modules/react-native-webview/android/build.gradle
-      - node_modules/react-native-screens/android/build.gradle
-      - node_modules/react-native-safe-area-context/android/build.gradle
-      - node_modules/react-native-fast-image/android/build.gradle
-      - node_modules/react-navigation/node_modules/react-native-screens/android/build.gradle
-      - node_modules/@react-native-masked-view/masked-view/android/build.gradle
-      - node_modules/@react-native-community/async-storage/android/build.gradle
-      - node_modules/expo/node_modules/react-native-safe-area-context/android/build.gradle
-    scandelete:
-      - node_modules
-    build:
-      - RN_VER=$(sed -n -E -e 's/.*"react-native":\s"([0-9.]+)".*/\1/p' ../../package.json
-        | head -n 1)
-      - RN_MVER=$(sed -n -E -e 's/.*"react-native":\s"0\.([0-9]+).*/\1/p' ../../package.json
-        | head -n 1)
-      - pushd $$react-native-reanimated$$
-      - yarn add react-native@"${RN_VER}"
-      - FOR_HERMES=True gradle assembleRelease
-      - popd
-      - mv $$react-native-reanimated$$/build/outputs/aar/android-release.aar ../../node_modules/react-native-reanimated/android/react-native-reanimated-$RN_MVER.aar
-    ndk: r21e
-
-  - versionName: 6.7.1
-    versionCode: 60710
-    disable: https://github.com/czy0729/Bangumi/issues/41#issuecomment-1201311651
-    commit: 86559298e51adaac8bc2793ee0cf7271898ffd20
-    subdir: android/app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-      - sysctl fs.inotify.max_user_watches=524288
-      - 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/
-      - npm -g install yarn
-    init:
-      - cd ../..
-      - patch -p1 < patches/diff.patch
-      - yarn install
-    gradle:
-      - yes
-    srclibs:
-      - react-native-reanimated@2.1.0
-    rm:
-      - node_modules/expo-location
-    prebuild:
-      - mv ../gradle_yours.properties ../gradle.properties
-      - sed -i -e '/aliyun/d' -e '/bintray/d' ../build.gradle
-      - sed -i -e 's|../app.json|../../app.json|' -e '/enableSeparateBuild/d' -e '/signingConfigs.release/d'
-        build.gradle
-      - sed -i -e '/installreferrer/,+11d' ../../node_modules/react-native-device-info/android/build.gradle
-      - sed -i -e "s|files('libs/jcifs-1.3.18.jar')|'org.codelibs:jcifs:1.3.18.3'|"
-        ../../node_modules/react-native-smb/android/build.gradle
-      - sed -i -e '/function xhr/,/^}/s/^  .*//' ../../src/utils/track.ts
-      - sed -i -e '/baidu/d' ../../web/manga.html
-    scanignore:
-      - android/build.gradle
-      - node_modules/hermes-engine
-      - node_modules/react-native/android/com/facebook/react/react-native/*/
-      - node_modules/react-native-device-info/android/build.gradle
-      - node_modules/react-native-webview/android/build.gradle
-      - node_modules/react-native-screens/android/build.gradle
-      - node_modules/react-native-safe-area-context/android/build.gradle
-      - node_modules/react-native-fast-image/android/build.gradle
-      - node_modules/react-navigation/node_modules/react-native-screens/android/build.gradle
-      - node_modules/@react-native-masked-view/masked-view/android/build.gradle
-      - node_modules/@react-native-community/async-storage/android/build.gradle
-      - node_modules/expo/node_modules/react-native-safe-area-context/android/build.gradle
-    scandelete:
-      - node_modules
-    build:
-      - RN_VER=$(sed -n -E -e 's/.*"react-native":\s"([0-9.]+)".*/\1/p' ../../package.json
-        | head -n 1)
-      - RN_MVER=$(sed -n -E -e 's/.*"react-native":\s"0\.([0-9]+).*/\1/p' ../../package.json
-        | head -n 1)
-      - pushd $$react-native-reanimated$$
-      - yarn add react-native@"${RN_VER}"
-      - FOR_HERMES=True gradle assembleRelease
-      - popd
-      - mv $$react-native-reanimated$$/build/outputs/aar/android-release.aar ../../node_modules/react-native-reanimated/android/react-native-reanimated-$RN_MVER.aar
-    ndk: r21e
-
   - versionName: 6.8.0
     versionCode: 60801
     commit: 7f0f8663c6c2cfc77611f2238d2d38eee0c9116d
@@ -322,10 +198,9 @@ Builds:
       - mv $$react-native-reanimated$$/build/outputs/aar/android-release.aar ../../node_modules/react-native-reanimated/android/react-native-reanimated-$RN_MVER.aar
     ndk: r21e
 
-  - versionName: 6.9.0
-    versionCode: 60900
-    disable: wait for F-Droid version
-    commit: b9e9c8290ca8eaeee7895ac44ddddbc24c3803d3
+  - versionName: 7.1.1
+    versionCode: 70100
+    commit: 8939661e42493c61915702bb1086bf1ea3b8ffdd
     subdir: android/app
     sudo:
       - apt-get update || apt-get update
@@ -343,18 +218,17 @@ Builds:
     gradle:
       - yes
     srclibs:
-      - react-native-reanimated@2.1.0
+      - react-native-reanimated@2.3.0
     rm:
       - node_modules/expo-location
     prebuild:
       - mv ../gradle_yours.properties ../gradle.properties
-      - sed -i -e '/aliyun/d' -e '/bintray/d' ../build.gradle
+      - sed -i -e '/aliyun/d' -e '/bintray/d' -e '/repositories {/a jcenter()' ../build.gradle
       - sed -i -e 's|../app.json|../../app.json|' -e '/enableSeparateBuild/d' -e '/signingConfigs.release/d'
-        build.gradle
+        -e "/android {/a packagingOptions {pickFirst 'lib/*/*.so'}" build.gradle
       - sed -i -e '/installreferrer/,+11d' ../../node_modules/react-native-device-info/android/build.gradle
       - sed -i -e "s|files('libs/jcifs-1.3.18.jar')|'org.codelibs:jcifs:1.3.18.3'|"
         ../../node_modules/react-native-smb/android/build.gradle
-      - sed -i -e '/function xhr/,/^}/s/^  .*//' ../../src/utils/track.ts
       - sed -i -e '/baidu/d' ../../web/manga.html
     scanignore:
       - android/build.gradle
@@ -381,11 +255,11 @@ Builds:
       - yarn add react-native@"${RN_VER}"
       - FOR_HERMES=True gradle assembleRelease
       - popd
-      - mv $$react-native-reanimated$$/build/outputs/aar/android-release.aar ../../node_modules/react-native-reanimated/android/react-native-reanimated-$RN_MVER.aar
+      - mv $$react-native-reanimated$$/build/outputs/aar/android-release.aar ../../node_modules/react-native-reanimated/android/react-native-reanimated-$RN_MVER-hermes.aar
     ndk: r21e
 
 AutoUpdateMode: None
 UpdateCheckMode: Tags
 UpdateCheckData: app.json|"versionCode":\s(\d+)|.|"version":\s"([\d.]+)"
-CurrentVersion: 7.1.0
+CurrentVersion: 7.1.1
 CurrentVersionCode: 70100