From 5f95b5c4aa7b7d10d052ba2176eb807279698a72 Mon Sep 17 00:00:00 2001 From: Aleksey Kosylo Date: Thu, 14 Mar 2024 13:17:47 +0100 Subject: [PATCH 1/6] docc building on GH --- .github/workflows/build.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf7b04c53..2d61e3f76 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,7 +53,16 @@ jobs: - name: Zip Documentations run: cd documentations/Build/Products/Debug; zip ../../../../documentation.zip DXFeedFramework.doccarchive -r; cd - - - name: Checkl file + - name: Create HTML Docs + run: ./build_doc.sh + shell: sh + + - name: Commit Docs + run: | + git add docs + git commit -m "Update DocC" + + - name: Checkl file run: ls -al release_sp.sh - name: Calculate package checksum From 896382f6d7b0667a34db47e878258cd753c9567b Mon Sep 17 00:00:00 2001 From: Aleksey Kosylo Date: Thu, 14 Mar 2024 13:24:17 +0100 Subject: [PATCH 2/6] test change of comments --- DXFeedFramework/SystemProperty.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DXFeedFramework/SystemProperty.swift b/DXFeedFramework/SystemProperty.swift index 26d63639e..7bd6c9010 100644 --- a/DXFeedFramework/SystemProperty.swift +++ b/DXFeedFramework/SystemProperty.swift @@ -6,7 +6,7 @@ import Foundation -/// Wrapper over the Java java.lang.System class, contains work with property getter/setter methods. +/// SWIFT Wrapper over the Java java.lang.System class, contains work with property getter/setter methods. /// /// In Java world, these properties can be set by passing the "-Dprop=value" argument in command line /// or calls java.lang.System.setProperty(String key, String value). From 1d2c7cf302a88476a16f77a8036f7e844adfa270 Mon Sep 17 00:00:00 2001 From: Aleksey Kosylo Date: Thu, 14 Mar 2024 13:40:07 +0100 Subject: [PATCH 3/6] available for ios > 13 --- DXFeedFramework/Api/DXFeed.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/DXFeedFramework/Api/DXFeed.swift b/DXFeedFramework/Api/DXFeed.swift index 5a85b4849..3556748ca 100644 --- a/DXFeedFramework/Api/DXFeed.swift +++ b/DXFeedFramework/Api/DXFeed.swift @@ -102,6 +102,7 @@ public extension DXFeed { return Promise(native: nativePromise) } + @available(iOS 13.0, *) @available(macOS 10.15, *) func getTimeSeries(type: IEventType.Type, symbol: Symbol, fromTime: Long, toTime: Long) -> Task<[MarketEvent]?, Error> { let task = Task { From 78e51d1743418952a8d322518a264a460643bd68 Mon Sep 17 00:00:00 2001 From: Aleksey Kosylo Date: Thu, 14 Mar 2024 14:26:06 +0100 Subject: [PATCH 4/6] reset changes --- DXFeedFramework/SystemProperty.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DXFeedFramework/SystemProperty.swift b/DXFeedFramework/SystemProperty.swift index 7bd6c9010..26d63639e 100644 --- a/DXFeedFramework/SystemProperty.swift +++ b/DXFeedFramework/SystemProperty.swift @@ -6,7 +6,7 @@ import Foundation -/// SWIFT Wrapper over the Java java.lang.System class, contains work with property getter/setter methods. +/// Wrapper over the Java java.lang.System class, contains work with property getter/setter methods. /// /// In Java world, these properties can be set by passing the "-Dprop=value" argument in command line /// or calls java.lang.System.setProperty(String key, String value). From 36146ab34d817067bc3b12fa76bddbf51541fd0e Mon Sep 17 00:00:00 2001 From: Aleksey Kosylo Date: Thu, 14 Mar 2024 14:42:41 +0100 Subject: [PATCH 5/6] fixes in yml --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2d61e3f76..78a79bf95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -62,19 +62,19 @@ jobs: git add docs git commit -m "Update DocC" - - name: Checkl file + - name: Check file run: ls -al release_sp.sh - name: Calculate package checksum run: ./release_sp.sh ${{ github.ref_name }} DXFeedFramework shell: sh - - name: Commit files + - name: Commit spm update run: | git config --local user.name "GitHub Action" git commit Package.swift -m "Update Package.swift" - - name: Push to swift branch. Update swift package. + - name: Push to swift branch. Update swift package and DocC. uses: ad-m/github-push-action@master with: github_token: ${{ secrets.GITHUB_TOKEN }} From 9f013be71e2d13345c98a3a3f019fe975ede55f8 Mon Sep 17 00:00:00 2001 From: Aleksey Kosylo Date: Thu, 14 Mar 2024 14:47:57 +0100 Subject: [PATCH 6/6] repo name as parameter of DocC script --- .github/workflows/build.yml | 2 +- build_doc.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 78a79bf95..7c1e87161 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,7 +54,7 @@ jobs: run: cd documentations/Build/Products/Debug; zip ../../../../documentation.zip DXFeedFramework.doccarchive -r; cd - - name: Create HTML Docs - run: ./build_doc.sh + run: ./build_doc.sh ${GITHUB_REPOSITORY#$GITHUB_REPOSITORY_OWNER/} shell: sh - name: Commit Docs diff --git a/build_doc.sh b/build_doc.sh index 983df21cb..858916eb0 100755 --- a/build_doc.sh +++ b/build_doc.sh @@ -1,7 +1,8 @@ +echo $1 xcodebuild docbuild -scheme DXFeedFramework -derivedDataPath documentations/ `(xcrun --find docc)` process-archive \ transform-for-static-hosting documentations/Build/Products/Debug/DXFeedFramework.doccarchive \ --output-path docs \ ---hosting-base-path dxfeed-graal-swift-api +--hosting-base-path $1