From fc0cd8545e52129014b8b1f484640f686922f11f Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Thu, 2 May 2024 20:25:37 -0400 Subject: [PATCH 1/2] Remove unused Dockerfile --- Dockerfile | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index e5340936d..000000000 --- a/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 rust:1.73 - -# Install system commands, Android SDK, and Ruby -RUN apt-get update \ - && apt-get install -y coreutils git wget locales android-sdk android-sdk-build-tools \ - && apt-get install -y python3 \ - && apt-get -y autoclean - -RUN ln -s /usr/bin/python3 /usr/bin/python & \ - ln -s /usr/bin/pip3 /usr/bin/pip - -# Set up the default locale -RUN locale-gen en_US.UTF-8 -ENV LANG="en_US.UTF-8" LANGUAGE="en_US:en" -ENV ANDROID_HOME=/usr/lib/android-sdk -ENV GRADLE_OPTS="-Xmx6G -XX:+HeapDumpOnOutOfMemoryError -Dorg.gradle.caching=true -Dorg.gradle.configureondemand=true -Dkotlin.compiler.execution.strategy=in-process -Dkotlin.incremental=false" - -# Download the SDK Manager -RUN wget https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip \ - && unzip commandlinetools-linux-6858069_latest.zip && rm commandlinetools-linux-6858069_latest.zip \ - && mkdir /usr/lib/android-sdk/cmdline-tools \ - && mv cmdline-tools /usr/lib/android-sdk/cmdline-tools/latest - -ENV PATH="//usr/lib/android-sdk/cmdline-tools/latest/bin:${PATH}" - -RUN yes | sdkmanager --licenses - -# Uninstall '29.0.3' so that the builds won't complain about it being installed in incorrect location -RUN sdkmanager --uninstall "build-tools;29.0.3" - -RUN sdkmanager --install \ - "build-tools;33.0.2" \ - "build-tools;34.0.0" \ - "platform-tools" \ - "platforms;android-33" \ - "platforms;android-34" \ - "ndk;25.1.8937393" \ - "ndk;25.2.9519653" - -RUN rustup target add x86_64-linux-android \ - i686-linux-android \ - armv7-linux-androideabi \ - aarch64-linux-android From d15fbf087434ce9a34fde51d3ffb29ea0a12a924 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Thu, 2 May 2024 20:33:44 -0400 Subject: [PATCH 2/2] Remove Android related Make tests --- Makefile | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/Makefile b/Makefile index f987d14c3..26af5e976 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,3 @@ -android_project_root := ./native/android -android_generated_source_path := $(android_project_root)/lib/build/generated/source -jni_libs_root := $(android_project_root)/lib/src/main/jniLibs - # The directory where the git repo is mounted in the docker container docker_container_repo_dir=/app @@ -33,24 +29,11 @@ endif clean: git clean -ffXd -_generate-jni-libs: - rm -rf $(jni_libs_root) - cargo build --release --lib --target x86_64-linux-android --target i686-linux-android --target armv7-linux-androideabi --target aarch64-linux-android - mkdir -p $(jni_libs_root)/arm64-v8a - mkdir -p $(jni_libs_root)/armeabi-v7a - mkdir -p $(jni_libs_root)/x86 - mkdir -p $(jni_libs_root)/x86_64 - cp ./target/aarch64-linux-android/release/libwp_api.so $(jni_libs_root)/arm64-v8a/libuniffi_wp_api.so - cp ./target/armv7-linux-androideabi/release/libwp_api.so $(jni_libs_root)/armeabi-v7a/libuniffi_wp_api.so - cp ./target/i686-linux-android/release/libwp_api.so $(jni_libs_root)/x86/libuniffi_wp_api.so - cp ./target/x86_64-linux-android/release/libwp_api.so $(jni_libs_root)/x86_64/libuniffi_wp_api.so - bindings: - rm -rf $(android_generated_source_path) target/swift-bindings + rm -rf target/swift-bindings cargo build --release #wp_api - cargo run --release --bin wp_uniffi_bindgen generate --library ./target/release/libwp_api.$(dylib_ext) --out-dir $(android_generated_source_path) --language kotlin cargo run --release --bin wp_uniffi_bindgen generate --library ./target/release/libwp_api.$(dylib_ext) --out-dir ./target/swift-bindings --language swift cp target/swift-bindings/wp_api.swift native/swift/Sources/wordpress-api-wrapper/wp_api.swift @@ -67,13 +50,6 @@ docs: docs-archive: docs tar -czvf docs.tar.gz docs -_test-android: - ./native/android/gradlew -p ./native/android cAT - -_publish-android-local: - ./native/android/gradlew -p ./native/android publishToMavenLocal -exclude-task prepareToPublishToS3 - - # Builds the library for all the various architectures / systems required in an XCFramework xcframework-libraries: # macOS @@ -203,10 +179,6 @@ test-swift-tvOS: xcframework test-swift-watchOS: xcframework scripts/xcodebuild-test.sh watchOS-10-4 -test-android: bindings _test-android - -publish-android-local: bindings _publish-android-local - test-rust-lib: $(rust_docker_run) cargo test --lib -- --nocapture