From 2d1e33a75e316ba24f8b724eb5ab4312e4f26599 Mon Sep 17 00:00:00 2001 From: h2zero Date: Wed, 11 Dec 2024 18:50:22 -0700 Subject: [PATCH] Prepare for v2 release --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 20 +++++++++++++ CMakeLists.txt_idf3 | 56 ----------------------------------- component.mk | 2 -- idf_component.yml | 3 ++ package.json | 17 ----------- 6 files changed, 24 insertions(+), 76 deletions(-) create mode 100644 .github/workflows/release.yml delete mode 100644 CMakeLists.txt_idf3 delete mode 100644 component.mk delete mode 100644 package.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 44b99f5..b899463 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: # See https://hub.docker.com/r/espressif/idf/tags and # https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-docker-image.html # for details. - idf_ver: ["release-v4.4", "release-v5.1", "release-v5.3"] + idf_ver: ["release-v4.4", "release-v5.1", "v5.3.2"] idf_target: ["esp32", "esp32s3", "esp32c2", "esp32c3", "esp32c6", "esp32h2", "esp32p4"] example: - NimBLE_Client diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..ff66f7f --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,20 @@ +name: Release + +on: + release: + types: [published] + +jobs: + build_docs: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Doxygen Action + uses: mattnotmitt/doxygen-action@v1.9.8 + with: + working-directory: 'docs/' + - name: Deploy + uses: peaceiris/actions-gh-pages@v4 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./docs/doxydocs/html \ No newline at end of file diff --git a/CMakeLists.txt_idf3 b/CMakeLists.txt_idf3 deleted file mode 100644 index c548f90..0000000 --- a/CMakeLists.txt_idf3 +++ /dev/null @@ -1,56 +0,0 @@ -# The following lines of boilerplate have to be in your project's -# CMakeLists in this exact order for cmake to work correctly -cmake_minimum_required(VERSION 3.5) - -set(SUPPORTED_TARGETS esp32) - -set(COMPONENT_SRCS - "src/NimBLE2904.cpp" - "src/NimBLEAddress.cpp" - "src/NimBLEAdvertisedDevice.cpp" - "src/NimBLEAdvertising.cpp" - "src/NimBLEBeacon.cpp" - "src/NimBLECharacteristic.cpp" - "src/NimBLEClient.cpp" - "src/NimBLEDescriptor.cpp" - "src/NimBLEDevice.cpp" - "src/NimBLEEddystoneTLM.cpp" - "src/NimBLEEddystoneURL.cpp" - "src/NimBLEHIDDevice.cpp" - "src/NimBLERemoteCharacteristic.cpp" - "src/NimBLERemoteDescriptor.cpp" - "src/NimBLERemoteService.cpp" - "src/NimBLEScan.cpp" - "src/NimBLESecurity.cpp" - "src/NimBLEServer.cpp" - "src/NimBLEService.cpp" - "src/NimBLEUtils.cpp" - "src/NimBLEUUID.cpp" -) - -set(COMPONENT_ADD_INCLUDEDIRS - src -) - -set(COMPONENT_PRIV_REQUIRES - nvs_flash - bt -) - -if(COMPONENTS MATCHES "esp-nimble-component") - list(APPEND COMPONENT_PRIV_REQUIRES - esp-nimble-component - ) -elseif(COMPONENTS MATCHES "nimble") - list(APPEND COMPONENT_PRIV_REQUIRES - nimble - ) -endif() - -if(COMPONENTS MATCHES "arduino") - list(APPEND COMPONENT_PRIV_REQUIRES - arduino - ) -endif() - -register_component() diff --git a/component.mk b/component.mk deleted file mode 100644 index 5634368..0000000 --- a/component.mk +++ /dev/null @@ -1,2 +0,0 @@ -COMPONENT_ADD_INCLUDEDIRS := src -COMPONENT_SRCDIRS := src \ No newline at end of file diff --git a/idf_component.yml b/idf_component.yml index 52a0df2..d3bb28a 100644 --- a/idf_component.yml +++ b/idf_component.yml @@ -1,4 +1,7 @@ ## IDF Component Manager Manifest File +version: "2.0.0" +license: "Apache-2.0" +description: "NimBLE C++ wrapper" dependencies: espressif/esp_hosted: version: "*" diff --git a/package.json b/package.json deleted file mode 100644 index 1efe13e..0000000 --- a/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "esp-nimble-cpp", - "version": "1.5.0", - "description": "NimBLE, BLE stack for the Espressif ESP32, ESP32-S and ESP32-C series of SoCs", - "keywords": [ - "BLE", - "espidf", - "arduino", - "espressif", - "esp32" - ], - "license": "LGPL-2.1-or-later", - "repository": { - "type": "git", - "url": "https://github.com/h2zero/esp-nimble-cpp" - } -}