Merge pull request #306 from Impact-I/bugfixes/1.3

Bugfixes/1.3

.gitignore

@@ -20,3 +20,4 @@ src/__pycache__/
 flutter/
 reflutter.egg-info/
 goma/
+.venv/

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 ARG HASH_PATCH
 ARG COMMIT
@@ -18,10 +18,10 @@ ENV HASH_PATCH=$HASH_PATCH
 ENV COMMIT=$COMMIT
 
 RUN apt-get update && \
-    DEBIAN_FRONTEND="noninteractive" apt-get install -y git git-svn git-man wget curl software-properties-common unzip python3-pip python3 lsb-release sudo apt-transport-https tzdata && \
+    DEBIAN_FRONTEND="noninteractive" apt-get install -y git git-svn git-man wget curl software-properties-common unzip python3-pip python3 lsb-release sudo apt-transport-https tzdata python3-pkgconfig && \
     mkdir t
 
-ENTRYPOINT ["/bin/sh", "-c", "cd /t && pip3 install wheel && pip3 install . && rm -rf ${DEPOT_TOOLS_PATH} 2> /dev/null && git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git $DEPOT_TOOLS_PATH && rm -rf ${TEMP_ENGINE} 2> /dev/null && git clone https://github.com/flutter/engine.git $TEMP_ENGINE && rm -rf ${ENGINE_PATH} 2> /dev/null && mkdir --parents $ENGINE_PATH && cd $TEMP_ENGINE && git config --global user.email \"[email protected]\" && git config --global user.name \"reflutter\" && git fetch origin $COMMIT && git reset --hard FETCH_HEAD && reflutter $HASH_PATCH -l && echo 'reflutter' > REFLUTTER && git add . && git commit -am \"reflutter\" && cd $ENGINE_PATH && echo 'solutions = [{\"managed\": False,\"name\": \"src/flutter\",\"url\": \"'$TEMP_ENGINE'\",\"custom_deps\": {},\"deps_file\": \"DEPS\",\"safesync_url\": \"\",},]' > .gclient && gclient sync && reflutter $HASH_PATCH -l && echo \"Wait... Change the source code...\" && sleep $WAIT && src/build/install-build-deps-android.sh --no-prompt && if [ \"$arm64\" != \"0\" ]; then src/flutter/tools/gn --no-goma --android --android-cpu=arm64 --runtime-mode=release && ninja -C src/out/android_release_arm64 && cp src/out/android_release_arm64/lib.stripped/libflutter.so /libflutter_arm64.so ;fi && if [ \"$arm\" != \"0\" ]; then src/flutter/tools/gn --no-goma --android --android-cpu=arm --runtime-mode=release && ninja -C src/out/android_release && cp src/out/android_release/lib.stripped/libflutter.so /libflutter_arm.so ;fi && if [ \"$x64\" != \"0\" ]; then src/flutter/tools/gn --no-goma --android --android-cpu=x64 --runtime-mode=release && ninja -C src/out/android_release_x64 && cp src/out/android_release_x64/lib.stripped/libflutter.so /libflutter_x64.so; fi &&  cd .. && cp -va *.so /t/"]
+ENTRYPOINT ["/bin/sh", "-c", "cd /t && pip3 install wheel && pip3 install . && rm -rf ${DEPOT_TOOLS_PATH} 2> /dev/null && git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git ${DEPOT_TOOLS_PATH} && rm -rf ${TEMP_ENGINE} 2> /dev/null && git clone https://github.com/flutter/engine.git ${TEMP_ENGINE} && rm -rf ${ENGINE_PATH} 2> /dev/null && mkdir -p ${ENGINE_PATH} && cd ${TEMP_ENGINE} && git config --global user.email \"[email protected]\" && git config --global user.name \"reflutter\" && git fetch origin ${COMMIT} && git reset --hard FETCH_HEAD && reflutter ${HASH_PATCH} -l && echo 'reflutter' > REFLUTTER && git add . && git commit -am \"reflutter\" && cd ${ENGINE_PATH} && echo 'solutions = [{\"managed\": False,\"name\": \"src/flutter\",\"url\": \"'${TEMP_ENGINE}'\",\"custom_deps\": {},\"deps_file\": \"DEPS\",\"safesync_url\": \"\",},]' > .gclient && gclient sync && reflutter ${HASH_PATCH} -l && echo \"Wait... Change the source code...\" && sleep $WAIT && if [ \"$arm64\" != \"0\" ]; then src/flutter/tools/gn --no-goma --android --android-cpu=arm64 --runtime-mode=release && ninja -C src/out/android_release_arm64 && cp src/out/android_release_arm64/lib.stripped/libflutter.so /libflutter_arm64.so ;fi && if [ \"$arm\" != \"0\" ]; then src/flutter/tools/gn --no-goma --android --android-cpu=arm --runtime-mode=release && ninja -C src/out/android_release && cp src/out/android_release/lib.stripped/libflutter.so /libflutter_arm.so ;fi && if [ \"$x64\" != \"0\" ]; then src/flutter/tools/gn --no-goma --android --android-cpu=x64 --runtime-mode=release && ninja -C src/out/android_release_x64 && cp src/out/android_release_x64/lib.stripped/libflutter.so /libflutter_x64.so; fi &&  cd .. && cp -va *.so /t/"]
 
 
 CMD ["bash"]

README.md

@@ -24,7 +24,7 @@ Key features:
 
 ```
 # Linux, Windows, MacOS
-pip3 install reflutter==0.7.8
+pip3 install reflutter==0.7.9
 ```
 
 ### Usage

scripts/.gitignore

@@ -0,0 +1 @@
+*.orig

scripts/build-engine

@@ -7,10 +7,7 @@ ROOT_DIR=$(pwd)
 brew update
 brew install libzip openssl libplist autoconf automake libtool autoconf-archive pkg-config ninja
 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/opt/[email protected]/lib/pkgconfig
-git clone https://github.com/libimobiledevice/libplist
-cd libplist && ./autogen.sh --without-cython && sudo make install && cd ..
-git clone https://github.com/libimobiledevice/libusbmuxd
-cd libusbmuxd && ./autogen.sh && sudo make install && cd ..
+brew install libplist libusbmuxd
 cd "$ROOT_DIR"
 xcrun --sdk macosx --show-sdk-path
 brew install ideviceinstaller

scripts/enginehash.tmp.csv

@@ -1,4 +1,9 @@
 version,Engine_commit,Snapshot_Hash
+3.24.3,36335019a8eab588c3c2ea783c618d90505be233,80a49c7111088100a233b2ae788e1f48
+3.26.0-0.1.pre,059e4e6d8ff6de39c29441c53e949bfb0bf17972,8d97f46f9e092e886d13bfafe3fc7004
+3.24.2,a6bd3f1de158bb61090e0c8053df93a10cb548e1,80a49c7111088100a233b2ae788e1f48
+3.25.0-0.1.pre,062b3a72fcbe76296ce19b02f58c03ba0cbb0dcf,13fc296ae53a2c88d454ab149588c7bb
+3.24.1,c9b9d5780da342eb3f0f5e439a7db06f7d112575,80a49c7111088100a233b2ae788e1f48
 3.24.0,b8800d88be4866db1b15f8b954ab2573bba9960f,80a49c7111088100a233b2ae788e1f48
 3.24.0-0.2.pre,6e4deceb3802049388e167e3b14fda5843ad16e6,80a49c7111088100a233b2ae788e1f48
 3.24.0-0.1.pre,d89dd85f25cf4a3e15465a59594f4125b7f48d39,80a49c7111088100a233b2ae788e1f48
@@ -363,7 +368,6 @@ v1.12.13+hotfix.3,ac9391978e7c0693b75a82c219e059b6ffee35c4,20e5c4f7dc44368ac5a17
 v1.13.0,617938024315e205f26ed72ff0f0647775fa6a71,69045f81def452ca6187efd1cb5e6b54
 v1.12.13+hotfix.2,6955b06cedb2425f4363f10642c9b0e63e496af0,20e5c4f7dc44368ac5a17643b93665f6
 v1.12.13+hotfix.1,c1e322b685a81c11c16bddd22282925b7d0272e8,20e5c4f7dc44368ac5a17643b93665f6
-v1.12.16,fad1b23c42b96197a097fe42d37171f32459fecb,20e5c4f7dc44368ac5a17643b93665f6
 v1.12.15,e136d637a87379658ee8f326c4e7875315d1f926,20e5c4f7dc44368ac5a17643b93665f6
 v1.12.14,c89ac6347b7e88a562ebc826a5ee9a07c7b4cab7,20e5c4f7dc44368ac5a17643b93665f6
 v1.12.13,b6b54fd60631a3828c2e2c9b079b5d1d2d8c8c37,20e5c4f7dc44368ac5a17643b93665f6

scripts/requirements.txt

@@ -0,0 +1 @@
+requests