Skip to content

Commit 2cd1782

Browse files
loudnateloudnate
authored
Merge pull request #36 from loudnate/remove-dependencies
Remove external dependencies
2 parents 382b80d + 5c8fb32 commit 2cd1782

File tree

14 files changed

+95
-76
lines changed

14 files changed

+95
-76
lines changed

‎.travis.yml‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
11
language: objective-c
22
osx_image: xcode7.3
3-
#before_install:
4-
# - brew update
5-
# - brew install carthage
6-
before_script:
7-
- carthage bootstrap
83
before_deploy:
94
- carthage build --no-skip-current
105

116
cache: cocoapods
12-
# podfile: Example/Podfile
7+
podfile: Example/Podfile
138

14-
# before_install:
15-
# - gem install cocoapods # Since Travis is not always on latest version
16-
# - pod install --project-directory=Example
9+
before_install:
10+
- gem install cocoapods # Since Travis is not always on latest version
11+
- pod install --project-directory=Example
1712

1813
script:
19-
# TODO: Build the CocoaPods project
20-
# - set -o pipefail && xcodebuild -workspace Example/xDripG5.xcworkspace -scheme xDripG5-Example -sdk iphonesimulator -destination name="iPhone 6" ONLY_ACTIVE_ARCH=NO | xcpretty
14+
- set -o pipefail && xcodebuild -workspace Example/xDripG5.xcworkspace -scheme xDripG5-Example -sdk iphonesimulator -destination name="iPhone 6" ONLY_ACTIVE_ARCH=NO | xcpretty
2115
- xctool -project xDripG5.xcodeproj -scheme xDripG5 -sdk iphonesimulator9.3 build test
22-
- pod lib lint --allow-warnings
16+
- pod lib lint

‎Cartfile‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Cartfile.resolved‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Example/Podfile.lock‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
PODS:
2-
- RNCryptor (4.0.0)
3-
- xDripG5 (0.4.0):
4-
- RNCryptor (~> 4.0)
2+
- xDripG5 (0.5.0)
53

64
DEPENDENCIES:
75
- xDripG5 (from `../`)
@@ -11,9 +9,8 @@ EXTERNAL SOURCES:
119
:path: ../
1210

1311
SPEC CHECKSUMS:
14-
RNCryptor: 59d6483908115af5c12b884db23392024e52a5fe
15-
xDripG5: ebd5b967768e7823b80c504b87256fd5dd55d469
12+
xDripG5: 0e6b96df757adbd51d5aa24c1ef63cb25a2d2b72
1613

1714
PODFILE CHECKSUM: 6b30cba971694d5258509315fb52eb645c9bc5e3
1815

19-
COCOAPODS: 1.0.0
16+
COCOAPODS: 1.0.1

‎Example/xDripG5.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,12 @@
121121
isa = PBXNativeTarget;
122122
buildConfigurationList = 607FACEF1AFB9204008FA782 /* Build configuration list for PBXNativeTarget "xDripG5_Example" */;
123123
buildPhases = (
124-
1A9A76347F38888700DA6FA9 /* 📦 Check Pods Manifest.lock */,
124+
1A9A76347F38888700DA6FA9 /* [CP] Check Pods Manifest.lock */,
125125
607FACCC1AFB9204008FA782 /* Sources */,
126126
607FACCD1AFB9204008FA782 /* Frameworks */,
127127
607FACCE1AFB9204008FA782 /* Resources */,
128-
4B912A9AD16911278D3DAA5C /* 📦 Embed Pods Frameworks */,
129-
2FC4228A9369221D367ED688 /* 📦 Copy Pods Resources */,
128+
4B912A9AD16911278D3DAA5C /* [CP] Embed Pods Frameworks */,
129+
2FC4228A9369221D367ED688 /* [CP] Copy Pods Resources */,
130130
);
131131
buildRules = (
132132
);
@@ -189,44 +189,44 @@
189189
/* End PBXResourcesBuildPhase section */
190190

191191
/* Begin PBXShellScriptBuildPhase section */
192-
1A9A76347F38888700DA6FA9 /* 📦 Check Pods Manifest.lock */ = {
192+
1A9A76347F38888700DA6FA9 /* [CP] Check Pods Manifest.lock */ = {
193193
isa = PBXShellScriptBuildPhase;
194194
buildActionMask = 2147483647;
195195
files = (
196196
);
197197
inputPaths = (
198198
);
199-
name = "📦 Check Pods Manifest.lock";
199+
name = "[CP] Check Pods Manifest.lock";
200200
outputPaths = (
201201
);
202202
runOnlyForDeploymentPostprocessing = 0;
203203
shellPath = /bin/sh;
204204
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
205205
showEnvVarsInLog = 0;
206206
};
207-
2FC4228A9369221D367ED688 /* 📦 Copy Pods Resources */ = {
207+
2FC4228A9369221D367ED688 /* [CP] Copy Pods Resources */ = {
208208
isa = PBXShellScriptBuildPhase;
209209
buildActionMask = 2147483647;
210210
files = (
211211
);
212212
inputPaths = (
213213
);
214-
name = "📦 Copy Pods Resources";
214+
name = "[CP] Copy Pods Resources";
215215
outputPaths = (
216216
);
217217
runOnlyForDeploymentPostprocessing = 0;
218218
shellPath = /bin/sh;
219219
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-xDripG5_Example/Pods-xDripG5_Example-resources.sh\"\n";
220220
showEnvVarsInLog = 0;
221221
};
222-
4B912A9AD16911278D3DAA5C /* 📦 Embed Pods Frameworks */ = {
222+
4B912A9AD16911278D3DAA5C /* [CP] Embed Pods Frameworks */ = {
223223
isa = PBXShellScriptBuildPhase;
224224
buildActionMask = 2147483647;
225225
files = (
226226
);
227227
inputPaths = (
228228
);
229-
name = "📦 Embed Pods Frameworks";
229+
name = "[CP] Embed Pods Frameworks";
230230
outputPaths = (
231231
);
232232
runOnlyForDeploymentPostprocessing = 0;

‎Pod/xDripG5.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
// Copyright © 2015 Nathan Racklyeft. All rights reserved.
77
//
88

9-
@import RNCryptor;
9+
10+
#import <xDripG5/AESCrypt.h>

‎xDripG5.podspec‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "xDripG5"
3-
s.version = "0.4.1"
3+
s.version = "0.5.0"
44
s.summary = "An interface for communicating with the G5 glucose transmitter over Bluetooth."
55

66
s.description = <<-DESC
@@ -20,9 +20,8 @@ Please note this project is neither created nor backed by Dexcom, Inc. Use of th
2020
s.platform = :ios, '9.3'
2121
s.requires_arc = true
2222

23-
s.source_files = ['xDripG5/**/*.swift', 'Pod/*.h']
24-
s.public_header_files = 'Pod/*.h'
23+
s.source_files = ['xDripG5/**/*.swift', 'xDripG5/AESCrypt.{h,m}', 'Pod/*.h']
24+
s.public_header_files = ['Pod/*.h', 'xDripG5/AESCrypt.h']
2525

2626
s.frameworks = 'CoreBluetooth'
27-
s.dependency 'RNCryptor', '~> 4.0'
2827
end

‎xDripG5.xcodeproj/project.pbxproj‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88

99
/* Begin PBXBuildFile section */
1010
430D64C51CB7846A00FCA750 /* NSData+CRC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430D64C41CB7846A00FCA750 /* NSData+CRC.swift */; };
11-
4337D7EB1C351B0B0016851F /* CommonCrypto.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4337D7EA1C351B0B0016851F /* CommonCrypto.framework */; };
12-
4337D7ED1C3521210016851F /* CommonCrypto.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4337D7EA1C351B0B0016851F /* CommonCrypto.framework */; };
13-
434FD68A1C3523A7000B4E2E /* CommonCrypto.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4337D7EA1C351B0B0016851F /* CommonCrypto.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1411
43CABDF71C3506F100005705 /* xDripG5.h in Headers */ = {isa = PBXBuildFile; fileRef = 43CABDF61C3506F100005705 /* xDripG5.h */; settings = {ATTRIBUTES = (Public, ); }; };
1512
43CABDFE1C3506F100005705 /* xDripG5.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43CABDF31C3506F100005705 /* xDripG5.framework */; };
1613
43CABE121C350B2800005705 /* BluetoothManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CABE0E1C350B2800005705 /* BluetoothManager.swift */; };
@@ -39,6 +36,8 @@
3936
43CE7CDC1CA77468003CC1B0 /* TransmitterStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CE7CDB1CA77468003CC1B0 /* TransmitterStatus.swift */; };
4037
43DC87C01C8B509B005BC30D /* NSData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DC87BF1C8B509B005BC30D /* NSData.swift */; };
4138
43DC87C21C8B520F005BC30D /* GlucoseRxMessageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DC87C11C8B520F005BC30D /* GlucoseRxMessageTests.swift */; };
39+
43EEA7111D14DC0800CBBDA0 /* AESCrypt.h in Headers */ = {isa = PBXBuildFile; fileRef = 43EEA70F1D14DC0800CBBDA0 /* AESCrypt.h */; settings = {ATTRIBUTES = (Public, ); }; };
40+
43EEA7121D14DC0800CBBDA0 /* AESCrypt.m in Sources */ = {isa = PBXBuildFile; fileRef = 43EEA7101D14DC0800CBBDA0 /* AESCrypt.m */; };
4241
43F82BCC1D035AA4006F5DD7 /* TransmitterTimeRxMessageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F82BCB1D035AA4006F5DD7 /* TransmitterTimeRxMessageTests.swift */; };
4342
43F82BCE1D035D5C006F5DD7 /* SessionStartRxMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F82BCD1D035D5C006F5DD7 /* SessionStartRxMessage.swift */; };
4443
43F82BD01D035D68006F5DD7 /* SessionStopRxMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F82BCF1D035D68006F5DD7 /* SessionStopRxMessage.swift */; };
@@ -63,15 +62,13 @@
6362
dstPath = "";
6463
dstSubfolderSpec = 10;
6564
files = (
66-
434FD68A1C3523A7000B4E2E /* CommonCrypto.framework in CopyFiles */,
6765
);
6866
runOnlyForDeploymentPostprocessing = 0;
6967
};
7068
/* End PBXCopyFilesBuildPhase section */
7169

7270
/* Begin PBXFileReference section */
7371
430D64C41CB7846A00FCA750 /* NSData+CRC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSData+CRC.swift"; sourceTree = "<group>"; };
74-
4337D7EA1C351B0B0016851F /* CommonCrypto.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CommonCrypto.framework; path = Carthage/Build/iOS/CommonCrypto.framework; sourceTree = "<group>"; };
7572
43CABDF31C3506F100005705 /* xDripG5.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = xDripG5.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7673
43CABDF61C3506F100005705 /* xDripG5.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = xDripG5.h; sourceTree = "<group>"; };
7774
43CABDF81C3506F100005705 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -103,6 +100,8 @@
103100
43CE7CDB1CA77468003CC1B0 /* TransmitterStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransmitterStatus.swift; sourceTree = "<group>"; };
104101
43DC87BF1C8B509B005BC30D /* NSData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSData.swift; sourceTree = "<group>"; };
105102
43DC87C11C8B520F005BC30D /* GlucoseRxMessageTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseRxMessageTests.swift; sourceTree = "<group>"; };
103+
43EEA70F1D14DC0800CBBDA0 /* AESCrypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AESCrypt.h; sourceTree = "<group>"; };
104+
43EEA7101D14DC0800CBBDA0 /* AESCrypt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AESCrypt.m; sourceTree = "<group>"; };
106105
43F82BCB1D035AA4006F5DD7 /* TransmitterTimeRxMessageTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransmitterTimeRxMessageTests.swift; sourceTree = "<group>"; };
107106
43F82BCD1D035D5C006F5DD7 /* SessionStartRxMessage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SessionStartRxMessage.swift; sourceTree = "<group>"; };
108107
43F82BCF1D035D68006F5DD7 /* SessionStopRxMessage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SessionStopRxMessage.swift; sourceTree = "<group>"; };
@@ -115,15 +114,13 @@
115114
isa = PBXFrameworksBuildPhase;
116115
buildActionMask = 2147483647;
117116
files = (
118-
4337D7EB1C351B0B0016851F /* CommonCrypto.framework in Frameworks */,
119117
);
120118
runOnlyForDeploymentPostprocessing = 0;
121119
};
122120
43CABDFA1C3506F100005705 /* Frameworks */ = {
123121
isa = PBXFrameworksBuildPhase;
124122
buildActionMask = 2147483647;
125123
files = (
126-
4337D7ED1C3521210016851F /* CommonCrypto.framework in Frameworks */,
127124
43CABDFE1C3506F100005705 /* xDripG5.framework in Frameworks */,
128125
);
129126
runOnlyForDeploymentPostprocessing = 0;
@@ -134,7 +131,6 @@
134131
43CABDE91C3506F100005705 = {
135132
isa = PBXGroup;
136133
children = (
137-
4337D7EA1C351B0B0016851F /* CommonCrypto.framework */,
138134
43CABDF51C3506F100005705 /* xDripG5 */,
139135
43CABE011C3506F100005705 /* xDripG5Tests */,
140136
43CABDF41C3506F100005705 /* Products */,
@@ -162,6 +158,8 @@
162158
43CABE111C350B2800005705 /* Transmitter.swift */,
163159
43CE7CDB1CA77468003CC1B0 /* TransmitterStatus.swift */,
164160
43CABE161C350B2E00005705 /* Messages */,
161+
43EEA70F1D14DC0800CBBDA0 /* AESCrypt.h */,
162+
43EEA7101D14DC0800CBBDA0 /* AESCrypt.m */,
165163
);
166164
path = xDripG5;
167165
sourceTree = "<group>";
@@ -215,6 +213,7 @@
215213
buildActionMask = 2147483647;
216214
files = (
217215
43CABDF71C3506F100005705 /* xDripG5.h in Headers */,
216+
43EEA7111D14DC0800CBBDA0 /* AESCrypt.h in Headers */,
218217
);
219218
runOnlyForDeploymentPostprocessing = 0;
220219
};
@@ -264,7 +263,7 @@
264263
43CABDEA1C3506F100005705 /* Project object */ = {
265264
isa = PBXProject;
266265
attributes = {
267-
LastSwiftUpdateCheck = 0720;
266+
LastSwiftUpdateCheck = 0730;
268267
LastUpgradeCheck = 0720;
269268
ORGANIZATIONNAME = "Nathan Racklyeft";
270269
TargetAttributes = {
@@ -328,6 +327,7 @@
328327
43CABE2A1C350B3D00005705 /* GlucoseTxMessage.swift in Sources */,
329328
43CE7CC81CA73AEB003CC1B0 /* FirmwareVersionTxMessage.swift in Sources */,
330329
43CE7CCC1CA73BCC003CC1B0 /* BatteryStatusTxMessage.swift in Sources */,
330+
43EEA7121D14DC0800CBBDA0 /* AESCrypt.m in Sources */,
331331
43CE7CCE1CA73C22003CC1B0 /* SessionStartTxMessage.swift in Sources */,
332332
43CABE2E1C350B3D00005705 /* TransmitterTimeTxMessage.swift in Sources */,
333333
43CABE2C1C350B3D00005705 /* TransmitterMessage.swift in Sources */,
@@ -388,7 +388,7 @@
388388
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
389389
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
390390
COPY_PHASE_STRIP = NO;
391-
CURRENT_PROJECT_VERSION = 10;
391+
CURRENT_PROJECT_VERSION = 11;
392392
DEBUG_INFORMATION_FORMAT = dwarf;
393393
ENABLE_STRICT_OBJC_MSGSEND = YES;
394394
ENABLE_TESTABILITY = YES;
@@ -436,7 +436,7 @@
436436
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
437437
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
438438
COPY_PHASE_STRIP = NO;
439-
CURRENT_PROJECT_VERSION = 10;
439+
CURRENT_PROJECT_VERSION = 11;
440440
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
441441
ENABLE_NS_ASSERTIONS = NO;
442442
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -464,12 +464,8 @@
464464
CLANG_ENABLE_MODULES = YES;
465465
DEFINES_MODULE = YES;
466466
DYLIB_COMPATIBILITY_VERSION = 1;
467-
DYLIB_CURRENT_VERSION = 10;
467+
DYLIB_CURRENT_VERSION = 11;
468468
DYLIB_INSTALL_NAME_BASE = "@rpath";
469-
FRAMEWORK_SEARCH_PATHS = (
470-
"$(inherited)",
471-
"$(PROJECT_DIR)/Carthage/Build/iOS",
472-
);
473469
INFOPLIST_FILE = xDripG5/Info.plist;
474470
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
475471
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -486,12 +482,8 @@
486482
CLANG_ENABLE_MODULES = YES;
487483
DEFINES_MODULE = YES;
488484
DYLIB_COMPATIBILITY_VERSION = 1;
489-
DYLIB_CURRENT_VERSION = 10;
485+
DYLIB_CURRENT_VERSION = 11;
490486
DYLIB_INSTALL_NAME_BASE = "@rpath";
491-
FRAMEWORK_SEARCH_PATHS = (
492-
"$(inherited)",
493-
"$(PROJECT_DIR)/Carthage/Build/iOS",
494-
);
495487
INFOPLIST_FILE = xDripG5/Info.plist;
496488
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
497489
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

‎xDripG5/AESCrypt.h‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//
2+
// AESCrypt.h
3+
// xDripG5
4+
//
5+
// Created by Nate Racklyeft on 6/17/16.
6+
// Copyright © 2016 Nathan Racklyeft. All rights reserved.
7+
//
8+
9+
#import <Foundation/Foundation.h>
10+
11+
@interface AESCrypt : NSObject
12+
13+
NS_ASSUME_NONNULL_BEGIN
14+
15+
+ (nullable NSData *)encryptData:(NSData *)data usingKey:(NSData *)key error:(NSError **)error;
16+
17+
NS_ASSUME_NONNULL_END
18+
19+
@end

‎xDripG5/AESCrypt.m‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
//
2+
// AESCrypt.m
3+
// xDripG5
4+
//
5+
// Created by Nate Racklyeft on 6/17/16.
6+
// Copyright © 2016 Nathan Racklyeft. All rights reserved.
7+
//
8+
9+
#import "AESCrypt.h"
10+
#import <CommonCrypto/CommonCryptor.h>
11+
12+
@implementation AESCrypt
13+
14+
+ (NSData *)encryptData:(NSData *)data usingKey:(NSData *)key error:(NSError * _Nullable __autoreleasing *)error
15+
{
16+
NSMutableData *dataOut = [[NSMutableData alloc] initWithCapacity:16];
17+
18+
CCCryptorStatus status = CCCrypt(kCCEncrypt,
19+
kCCAlgorithmAES,
20+
kCCOptionECBMode,
21+
key.bytes,
22+
key.length,
23+
NULL,
24+
data.bytes,
25+
data.length,
26+
dataOut.mutableBytes,
27+
dataOut.length,
28+
NULL);
29+
30+
return status == kCCSuccess ? dataOut : nil;
31+
}
32+
33+
@end

0 commit comments

Comments
 (0)