Use sub-directory for headers

Author: ineiti

.github/workflows/ios-release.yaml

@@ -31,6 +31,8 @@ jobs:
           target: aarch64-apple-ios
 
       - name: Build XCFramework
+        env:
+          CARGO_INCREMENTAL: 1
         run: |
           make build-ios
           shasum -a 256 arti-rest.xcframework.zip >> ios/body.md

Makefile

@@ -15,8 +15,9 @@ $(arxcz): ios/$(arxc)
 dev:
 	perl -pi -e 's/lto = "fat"/lto = "thin"/' Cargo.toml
 	perl -pi -e 's/.*opt-level = "s"/#opt-level = "s"/' Cargo.toml
+	rm -rf ../arti-ios/arti-rest.xcframework
 	cd ios && \
 	./build_xcf.sh dev && \
 	cp -av arti-rest.xcframework ../../arti-ios
 	perl -pi -e 's/lto = "thin"/lto = "fat"/' Cargo.toml
-	perl -pi -e 's/#opt-level = "s"/opt-level = "s"/' Cargo.toml
+	perl -pi -e 's/.*#opt-level = "s"/opt-level = "s"/' Cargo.toml

ios/build_xcf.sh

@@ -22,10 +22,11 @@ fi
 for arch in $ARCHS; do
 	cargo build --target $arch $MODEFLAG
 	tdir=../target/$arch/$MODE
-  mkdir -p $tdir/headers
-	cp arti-rest.h module.modulemap $tdir/headers
+  rm -rf $tdir/headers
+  mkdir -p $tdir/headers/arti-rest
+	cp arti-rest.h module.modulemap $tdir/headers/arti-rest
   XCFRAMEWORK_ARGS="${XCFRAMEWORK_ARGS} -library $tdir/libcore.a"
-  XCFRAMEWORK_ARGS="${XCFRAMEWORK_ARGS} -headers $tdir/headers/"
+  XCFRAMEWORK_ARGS="${XCFRAMEWORK_ARGS} -headers $tdir/headers/arti-rest"
 done
 
 XCFFILE=arti-rest.xcframework

ios/modulemap.xcconfig

@@ -0,0 +1 @@
+MODULE_MAP = arti-rest.modulemap