diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d0510d1..c0149fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ jobs: concurrency: group: ${{ github.ref }} cancel-in-progress: true - runs-on: macos-12 + runs-on: macos-15 steps: - name: Checkout @@ -30,7 +30,7 @@ jobs: - name: Setup Xcode uses: maxim-lobanov/setup-xcode@v1.4.1 with: - xcode-version: 14.2 + xcode-version: 16.2 - name: Build run: make zip diff --git a/Makefile b/Makefile index 9bbf822..29aa86e 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +# SIDESTORE_REPO ?= ../../../SideStore SIDESTORE_REPO ?= ../SideStore SKIP_SIM ?= false TARGET="minimuxer" @@ -40,13 +41,13 @@ copy: @echo "SIDESTORE_REPO: $(SIDESTORE_REPO)" @echo "copying libraries" - @cp target/libminimuxer-ios.a "$(SIDESTORE_REPO)/Dependencies/minimuxer" - @cp target/libminimuxer-sim.a "$(SIDESTORE_REPO)/Dependencies/minimuxer" + @cp target/libminimuxer-ios.a "$(SIDESTORE_REPO)/SideStore/minimuxer" + @cp target/libminimuxer-sim.a "$(SIDESTORE_REPO)/SideStore/minimuxer" @echo "copying generated" - @cp generated/* "$(SIDESTORE_REPO)/Dependencies/minimuxer" + @cp generated/* "$(SIDESTORE_REPO)/SideStore/minimuxer" - @touch "$(SIDESTORE_REPO)/Dependencies/.skip-prebuilt-fetch-minimuxer" + @touch "$(SIDESTORE_REPO)/SideStore/.skip-prebuilt-fetch-minimuxer" build: compile copy diff --git a/src/muxer.rs b/src/muxer.rs index a830528..146f992 100644 --- a/src/muxer.rs +++ b/src/muxer.rs @@ -258,7 +258,7 @@ pub static STARTED: AtomicBool = AtomicBool::new(false); pub static STARTED: AtomicBool = AtomicBool::new(true); // minimuxer won't start in tests /// Starts the muxer and heartbeat client -/// # Arguments\ +/// # Arguments /// Pairing file contents as a string and log path as a string pub fn start(pairing_file: String, log_path: String) -> crate::Res<()> { startWithLogger(pairing_file, log_path, true) // logging is enabled by default as before