Skip to content

Commit

Permalink
AcraWriter iOS (cossacklabs#341)
Browse files Browse the repository at this point in the history 
* acrawriter swift -> move files to push bitrise to work

* more workarounds

* one more try

* plz work

* and again

* rm "xcfilelist"
  • Loading branch information
@vixentael
vixentael authored May 26, 2019
1 parent bca672e commit dd771fa
Show file tree
Hide file tree
Showing 12 changed files with 132 additions and 50 deletions.
83 changes: 37 additions & 46 deletions ...AcraWriterSwift.xcodeproj/project.pbxproj → ...AcraWriterSwift.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,63 +7,56 @@
objects = {

/* Begin PBXBuildFile section */
0949AEEC8E80E5C791EE8B83 /* Pods_AcraWriterSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21555608E00499EF56C1B487 /* Pods_AcraWriterSwift.framework */; };
7319361A222F1961004E6922 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73193619222F1961004E6922 /* AppDelegate.swift */; };
7319361C222F1961004E6922 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7319361B222F1961004E6922 /* ViewController.swift */; };
7319361F222F1961004E6922 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7319361D222F1961004E6922 /* Main.storyboard */; };
73193621222F1961004E6922 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 73193620222F1961004E6922 /* Assets.xcassets */; };
73193624222F1961004E6922 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 73193622222F1961004E6922 /* LaunchScreen.storyboard */; };
93F396815A02BE9C9131AFED /* Pods_AcraWriterSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABDE7353475872AB36BDD5BC /* Pods_AcraWriterSwift.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
06419B973EEA325975FB05FF /* Pods-AcraWriterSwift.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AcraWriterSwift.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-AcraWriterSwift/Pods-AcraWriterSwift.debug.xcconfig"; sourceTree = "<group>"; };
21555608E00499EF56C1B487 /* Pods_AcraWriterSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AcraWriterSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
47322147922055B8BD0D5381 /* Pods-AcraWriterSwift.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AcraWriterSwift.release.xcconfig"; path = "Target Support Files/Pods-AcraWriterSwift/Pods-AcraWriterSwift.release.xcconfig"; sourceTree = "<group>"; };
73193616222F1961004E6922 /* AcraWriterSwift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AcraWriterSwift.app; sourceTree = BUILT_PRODUCTS_DIR; };
73193619222F1961004E6922 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
7319361B222F1961004E6922 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
7319361E222F1961004E6922 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
73193620222F1961004E6922 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
73193623222F1961004E6922 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
73193625222F1961004E6922 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9597A5685867678CB385F504 /* Pods-AcraWriterSwift.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AcraWriterSwift.release.xcconfig"; path = "../Pods/Target Support Files/Pods-AcraWriterSwift/Pods-AcraWriterSwift.release.xcconfig"; sourceTree = "<group>"; };
90DA01B338F2DE08207BC4AB /* Pods-AcraWriterSwift.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AcraWriterSwift.debug.xcconfig"; path = "Target Support Files/Pods-AcraWriterSwift/Pods-AcraWriterSwift.debug.xcconfig"; sourceTree = "<group>"; };
ABDE7353475872AB36BDD5BC /* Pods_AcraWriterSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AcraWriterSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
73193613222F1961004E6922 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
0949AEEC8E80E5C791EE8B83 /* Pods_AcraWriterSwift.framework in Frameworks */,
93F396815A02BE9C9131AFED /* Pods_AcraWriterSwift.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
1C87E32986ED61B437CAC636 /* Frameworks */ = {
58D640A7C81AB1D6C2F8D5D6 /* Pods */ = {
isa = PBXGroup;
children = (
21555608E00499EF56C1B487 /* Pods_AcraWriterSwift.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
5F829A0C664F0AC7AB53BB7C /* Pods */ = {
isa = PBXGroup;
children = (
06419B973EEA325975FB05FF /* Pods-AcraWriterSwift.debug.xcconfig */,
9597A5685867678CB385F504 /* Pods-AcraWriterSwift.release.xcconfig */,
90DA01B338F2DE08207BC4AB /* Pods-AcraWriterSwift.debug.xcconfig */,
47322147922055B8BD0D5381 /* Pods-AcraWriterSwift.release.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
7319360D222F1960004E6922 = {
isa = PBXGroup;
children = (
73193618222F1961004E6922 /* AcraWriterSwift */,
73193617222F1961004E6922 /* Products */,
5F829A0C664F0AC7AB53BB7C /* Pods */,
1C87E32986ED61B437CAC636 /* Frameworks */,
58D640A7C81AB1D6C2F8D5D6 /* Pods */,
FAFF9F58CCF931111DD36386 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand All @@ -88,18 +81,26 @@
path = AcraWriterSwift;
sourceTree = "<group>";
};
FAFF9F58CCF931111DD36386 /* Frameworks */ = {
isa = PBXGroup;
children = (
ABDE7353475872AB36BDD5BC /* Pods_AcraWriterSwift.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
73193615222F1961004E6922 /* AcraWriterSwift */ = {
isa = PBXNativeTarget;
buildConfigurationList = 73193628222F1961004E6922 /* Build configuration list for PBXNativeTarget "AcraWriterSwift" */;
buildPhases = (
7ECC9D1F1027230FD5FCEAC7 /* [CP] Check Pods Manifest.lock */,
551A2F8B3F794893D2EEADB7 /* [CP] Check Pods Manifest.lock */,
73193612222F1961004E6922 /* Sources */,
73193613222F1961004E6922 /* Frameworks */,
73193614222F1961004E6922 /* Resources */,
6AB8EA5E3DE5999F6782507D /* [CP] Embed Pods Frameworks */,
7847F501F2524B3719BCA920 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -122,6 +123,7 @@
TargetAttributes = {
73193615222F1961004E6922 = {
CreatedOnToolsVersion = 10.1;
LastSwiftMigration = 1020;
};
};
};
Expand Down Expand Up @@ -157,52 +159,41 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
6AB8EA5E3DE5999F6782507D /* [CP] Embed Pods Frameworks */ = {
551A2F8B3F794893D2EEADB7 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${SRCROOT}/../Pods/Target Support Files/Pods-AcraWriterSwift/Pods-AcraWriterSwift-frameworks.sh",
"${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework",
"${BUILT_PRODUCTS_DIR}/acrawriter/acrawriter.framework",
"${BUILT_PRODUCTS_DIR}/themis/themis.framework",
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Embed Pods Frameworks";
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/acrawriter.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/themis.framework",
"$(DERIVED_FILE_DIR)/Pods-AcraWriterSwift-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-AcraWriterSwift/Pods-AcraWriterSwift-frameworks.sh\"\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
7ECC9D1F1027230FD5FCEAC7 /* [CP] Check Pods Manifest.lock */ = {
7847F501F2524B3719BCA920 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-AcraWriterSwift-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AcraWriterSwift/Pods-AcraWriterSwift-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -290,7 +281,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -345,7 +336,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
Expand All @@ -357,7 +348,7 @@
};
73193629222F1961004E6922 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 06419B973EEA325975FB05FF /* Pods-AcraWriterSwift.debug.xcconfig */;
baseConfigurationReference = 90DA01B338F2DE08207BC4AB /* Pods-AcraWriterSwift.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
Expand All @@ -369,14 +360,14 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.cossacklabs.AcraWriterSwift;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
7319362A222F1961004E6922 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 9597A5685867678CB385F504 /* Pods-AcraWriterSwift.release.xcconfig */;
baseConfigurationReference = 47322147922055B8BD0D5381 /* Pods-AcraWriterSwift.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
Expand All @@ -388,7 +379,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.cossacklabs.AcraWriterSwift;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down
91 changes: 91 additions & 0 deletions examples/swift/AcraWriterSwift.xcodeproj/xcshareddata/xcschemes/AcraWriterSwift.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "73193615222F1961004E6922"
BuildableName = "AcraWriterSwift.app"
BlueprintName = "AcraWriterSwift"
ReferencedContainer = "container:AcraWriterSwift.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "73193615222F1961004E6922"
BuildableName = "AcraWriterSwift.app"
BlueprintName = "AcraWriterSwift"
ReferencedContainer = "container:AcraWriterSwift.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "73193615222F1961004E6922"
BuildableName = "AcraWriterSwift.app"
BlueprintName = "AcraWriterSwift"
ReferencedContainer = "container:AcraWriterSwift.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "73193615222F1961004E6922"
BuildableName = "AcraWriterSwift.app"
BlueprintName = "AcraWriterSwift"
ReferencedContainer = "container:AcraWriterSwift.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
2 changes: 1 addition & 1 deletion examples/swift/AcraWriterSwift.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...erSwift/AcraWriterSwift/AppDelegate.swift → ...s/swift/AcraWriterSwift/AppDelegate.swift
View file
File renamed without changes.
0 ...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
View file
File renamed without changes.
0 ...WriterSwift/Assets.xcassets/Contents.json → ...WriterSwift/Assets.xcassets/Contents.json
View file
File renamed without changes.
0 ...rSwift/Base.lproj/LaunchScreen.storyboard → ...rSwift/Base.lproj/LaunchScreen.storyboard
View file
File renamed without changes.
0 ...craWriterSwift/Base.lproj/Main.storyboard → ...craWriterSwift/Base.lproj/Main.storyboard
View file
File renamed without changes.
0 ...craWriterSwift/AcraWriterSwift/Info.plist → examples/swift/AcraWriterSwift/Info.plist
View file
File renamed without changes.
0 ...wift/AcraWriterSwift/ViewController.swift → ...wift/AcraWriterSwift/ViewController.swift
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/swift/Podfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://github.com/CocoaPods/Specs.git'

platform :ios, '8.0'
project 'AcraWriterSwift/AcraWriterSwift.xcodeproj'
project 'AcraWriterSwift.xcodeproj'
inhibit_all_warnings!
use_frameworks!

Expand Down
4 changes: 2 additions & 2 deletions examples/swift/Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ SPEC CHECKSUMS:
GRKOpenSSLFramework: 35944e317e6336b2944ad70b059d84db6b2d8532
themis: 56654bb58700ece55439716058943f8f435b228d

PODFILE CHECKSUM: 71ccc700de45c93317c6b36ddece022dc740f00b
PODFILE CHECKSUM: 68ba2374d972b2371807f2fbaf28f4d1dc74052f

COCOAPODS: 1.5.3
COCOAPODS: 1.7.0

0 comments on commit dd771fa

Please sign in to comment.