Skip to content

Commit

Permalink
Pull request #6: Feature/MDAPI-91 ipf propfile handle
Browse files Browse the repository at this point in the history 
Merge in MDAPI/dxfeed-graal-swift-api from feature/MDAPI-91_ipf_propfile_handle to main

Squashed commit of the following:

commit dac372f68cf95f293ddd64ffe641473b2e0a2495
Author: Aleksey Kosylo <[email protected]>
Date:   Tue Jul 23 14:35:45 2024 +0200

    fix warning

commit 8c660f72f5ef10627e836872a7f6604331bc32db
Merge: 06fd5e9 0370c74
Author: Aleksey Kosylo <[email protected]>
Date:   Tue Jul 23 14:19:22 2024 +0200

    Merge branch 'main' into feature/MDAPI-91_ipf_propfile_handle

    # Conflicts:
    #	DXFeedFramework.xcodeproj/project.pbxproj
    #	DXFeedFrameworkTests/IPFTests.swift
    #	build.gradle

commit 06fd5e9aabb2e4f570909964f9907a7990b4aabb
Author: Aleksey Kosylo <[email protected]>
Date:   Tue Jul 23 13:55:57 2024 +0200

    [MDAPI-91] fir after PR

commit 56c0b81cbb5f9a8aeb99ab313708c495a99b7684
Author: Aleksey Kosylo <[email protected]>
Date:   Tue Jul 23 13:19:27 2024 +0200

    fix memory leak

commit ba84d588ce6a14a83b10a5a8c8169dcd1286cb83
Author: Aleksey Kosylo <[email protected]>
Date:   Wed Jul 17 14:44:52 2024 +0200

    [MDAPI-91] remove unused class

commit bf16013cd89134f0cd310f0a925a3cd00585cf4e
Author: Aleksey Kosylo <[email protected]>
Date:   Wed Jul 17 13:11:16 2024 +0200

    fix tests

commit c2c535aa8ad4a82faa56df0ca4133ccab30b6cc7
Author: Aleksey Kosylo <[email protected]>
Date:   Wed Jul 17 11:34:45 2024 +0200

    remove .spm_jfrog folder

commit 8813aff308527d757229f77a0689473b96baace7
Author: Aleksey Kosylo <[email protected]>
Date:   Wed Jul 17 11:24:29 2024 +0200

    [MDAPI-91] Instrument profile to native handle
    add tests, fix access levels, fix warnings

commit 05ca3e2ec64e1d09ff53824ee53659f8efc5b971
Author: Aleksey Kosylo <[email protected]>
Date:   Tue Jul 16 16:42:57 2024 +0200

    [MDAPI-91] Instrument profile to native handle
    add test for customfields

commit 4928e19ccbd9b6423dba79c2a8e6ccc07daccf27
Author: Aleksey Kosylo <[email protected]>
Date:   Mon Jul 15 16:32:23 2024 +0200

    wip: Instrument profile to native handle
  • Loading branch information
@kosyloa
kosyloa committed Jul 23, 2024
1 parent 0370c74 commit 3d7ad95
Show file tree
Hide file tree
Showing 16 changed files with 842 additions and 368 deletions.
25 changes: 0 additions & 25 deletions .spm_jrog/Package.swift
View file

This file was deleted.

14 changes: 5 additions & 9 deletions DXFeedFramework.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,6 @@
646064EA2B4D8973009201E2 /* DXLastEventTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 646064E92B4D8973009201E2 /* DXLastEventTest.swift */; };
646228512A376B0A0029DC97 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6462284D2A376B0A0029DC97 /* Main.storyboard */; };
646228522A376B0A0029DC97 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6462284F2A376B0A0029DC97 /* LaunchScreen.storyboard */; };
646407492A9DF984006FF769 /* InstrumentProfileMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 646407482A9DF984006FF769 /* InstrumentProfileMapper.swift */; };
6464074B2A9DFAF7006FF769 /* InstrumentProfile+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6464074A2A9DFAF7006FF769 /* InstrumentProfile+Ext.swift */; };
6464074D2A9E352E006FF769 /* InstrumentProfileField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6464074C2A9E352E006FF769 /* InstrumentProfileField.swift */; };
6464074F2A9F62D4006FF769 /* Date+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6464074E2A9F62D4006FF769 /* Date+Ext.swift */; };
646407572AA0C44D006FF769 /* NativeInstrumentProfileCollector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 646407562AA0C44D006FF769 /* NativeInstrumentProfileCollector.swift */; };
Expand Down Expand Up @@ -300,6 +298,7 @@
649282E72AD54919008F0F04 /* ScheduleUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649282E62AD54919008F0F04 /* ScheduleUtils.swift */; };
649282E82AD54919008F0F04 /* ScheduleUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649282E62AD54919008F0F04 /* ScheduleUtils.swift */; };
649282ED2AD593F3008F0F04 /* OrderSourceTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649282EC2AD593F3008F0F04 /* OrderSourceTest.swift */; };
64933DA32C4553CC004E296C /* NativeInstrumentProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64933DA22C4553CC004E296C /* NativeInstrumentProfile.swift */; };
64933D9B2C4161F8004E296C /* DXAuthToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64933D9A2C4161F8004E296C /* DXAuthToken.swift */; };
64933D9D2C416229004E296C /* NativeAuthToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64933D9C2C416229004E296C /* NativeAuthToken.swift */; };
64933D9F2C416AE3004E296C /* DXAuthTokenTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64933D9E2C416AE3004E296C /* DXAuthTokenTest.swift */; };
Expand Down Expand Up @@ -872,8 +871,6 @@
646064E92B4D8973009201E2 /* DXLastEventTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DXLastEventTest.swift; sourceTree = "<group>"; };
6462284E2A376B0A0029DC97 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
646228502A376B0A0029DC97 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
646407482A9DF984006FF769 /* InstrumentProfileMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstrumentProfileMapper.swift; sourceTree = "<group>"; };
6464074A2A9DFAF7006FF769 /* InstrumentProfile+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "InstrumentProfile+Ext.swift"; sourceTree = "<group>"; };
6464074C2A9E352E006FF769 /* InstrumentProfileField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstrumentProfileField.swift; sourceTree = "<group>"; };
6464074E2A9F62D4006FF769 /* Date+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Ext.swift"; sourceTree = "<group>"; };
646407562AA0C44D006FF769 /* NativeInstrumentProfileCollector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeInstrumentProfileCollector.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -941,6 +938,7 @@
648E98A92AAF625800BFD219 /* IIndexedEvent+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "IIndexedEvent+Ext.swift"; sourceTree = "<group>"; };
649282E62AD54919008F0F04 /* ScheduleUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScheduleUtils.swift; sourceTree = "<group>"; };
649282EC2AD593F3008F0F04 /* OrderSourceTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderSourceTest.swift; sourceTree = "<group>"; };
64933DA22C4553CC004E296C /* NativeInstrumentProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeInstrumentProfile.swift; sourceTree = "<group>"; };
64933D9A2C4161F8004E296C /* DXAuthToken.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DXAuthToken.swift; sourceTree = "<group>"; };
64933D9C2C416229004E296C /* NativeAuthToken.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeAuthToken.swift; sourceTree = "<group>"; };
64933D9E2C416AE3004E296C /* DXAuthTokenTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DXAuthTokenTest.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1447,8 +1445,7 @@
children = (
6464075E2AA1C7BB006FF769 /* Live */,
64437A912A9DF1DE005929B2 /* NativeInstrumentProfileReader.swift */,
646407482A9DF984006FF769 /* InstrumentProfileMapper.swift */,
6464074A2A9DFAF7006FF769 /* InstrumentProfile+Ext.swift */,
64933DA22C4553CC004E296C /* NativeInstrumentProfile.swift */,
);
path = Ipf;
sourceTree = "<group>";
Expand Down Expand Up @@ -2693,7 +2690,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if [ -d \"graal_builds\" ]; then\n echo \"Grall builds are existing\"\n if [ -d \"graal_builds/osx_universal\" ]; then\n echo \"Graal ios is ready.\"\n else\n echo \"Graal ios is not ready.\"\n fi\n\n if [ -d \"graal_builds/osx_universal\" ]; then\n echo \"Graal is ready.\"\n else \n echo \"Create universal macOS lib\"\n cp -r \"graal_builds/osx_x86\" \"graal_builds/temp\"\n rm \"graal_builds/temp/libDxFeedGraalNativeSdk.dylib\"\n lipo \"graal_builds/osx_x86/libDxFeedGraalNativeSdk.dylib\" \"graal_builds/osx_arm/libDxFeedGraalNativeSdk.dylib\" -output \"graal_builds/temp/libDxFeedGraalNativeSdk.dylib\" -create\n mv \"graal_builds/temp\" \"graal_builds/osx_universal\"\n fi\n \nelse\n echo \"Grall builds are not existing. Please download dependencies using shell command 'gradle fetchDependencies.\"\n exit 1\nfi\n";
shellScript = "if [ -d \"graal_builds\" ]; then\n echo \"Grall builds are existing\"\n if [ -d \"graal_builds/osx_universal\" ]; then\n echo \"Graal ios is ready.\"\n else\n echo \"Graal ios is not ready.\"\n fi\n\n if [ -d \"graal_builds/osx_universal\" ]; then\n echo \"Graal is ready.\"\n else \n echo \"Create universal macOS lib\"\n cp -r \"graal_builds/osx_x86\" \"graal_builds/temp\"\n rm \"graal_builds/temp/libDxFeedGraalNativeSdk.dylib\"\n lipo \"graal_builds/osx_x86/libDxFeedGraalNativeSdk.dylib\" \"graal_builds/osx_arm/libDxFeedGraalNativeSdk.dylib\" -output \"graal_builds/temp/libDxFeedGraalNativeSdk.dylib\" -create\n mv \"graal_builds/temp\" \"graal_builds/osx_universal\"\n fi\n \nelse\n echo \"Grall builds are not existing. Please download dependencies using shell command './gradlew'.\"\n exit 1\nfi\n";
};
803BAC3729BFAAEC00FFAB1C /* Build XCFramework */ = {
isa = PBXShellScriptBuildPhase;
Expand Down Expand Up @@ -2935,7 +2932,6 @@
64A42F502B0BA668001C3ACC /* DXTimeFormat.swift in Sources */,
64BA92652A306E0200BE26A0 /* Trade.swift in Sources */,
6486B9752AD0493F00D8D5FA /* TheoPrice+Ext.swift in Sources */,
6464074B2A9DFAF7006FF769 /* InstrumentProfile+Ext.swift in Sources */,
643A329B2BD0137000F6F790 /* Optional+Ext.swift in Sources */,
64C771F22A94A224009868C2 /* Character+Ext.swift in Sources */,
8088D77129C3A25D00F240CB /* SystemProperty.swift in Sources */,
Expand Down Expand Up @@ -3083,13 +3079,13 @@
64BA92692A306E6000BE26A0 /* TradeBase.swift in Sources */,
640C3FD02A6178B400555161 /* CandlePrice.swift in Sources */,
641A599A2AB4794E003899FB /* TradeETH.swift in Sources */,
64933DA32C4553CC004E296C /* NativeInstrumentProfile.swift in Sources */,
64DA26C02AA224EB005B1757 /* NativeIPFConnectionListener.swift in Sources */,
8088D77D29C8DAF800F240CB /* GraalErrorCode.swift in Sources */,
64DA26B62AA1EF47005B1757 /* DXProfileIterator.swift in Sources */,
8088D76929C0FC5C00F240CB /* Isolate.swift in Sources */,
64278C722A6030290074B5AA /* CandleMapper.swift in Sources */,
649F48862A615BC90016FDD1 /* CandleSymbol.swift in Sources */,
646407492A9DF984006FF769 /* InstrumentProfileMapper.swift in Sources */,
64656F6B2A1CFAC2006A0B19 /* BridgeUtil.swift in Sources */,
64A42F3E2B07A807001C3ACC /* NativeSymbolParser.swift in Sources */,
8088D77329C3A2F400F240CB /* GraalException.swift in Sources */,
Expand Down
Loading

0 comments on commit 3d7ad95

Please sign in to comment.