Skip to content

Commit a2e7309

Browse files
uerceguerceg
committed
Various cleanups
1 parent 584f4ea commit a2e7309

File tree

11 files changed

+54
-52
lines changed

11 files changed

+54
-52
lines changed

‎android/libs/adjust-android.jar‎

0 Bytes
Binary file not shown.

‎index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Adjust.create = function(adjustConfig) {
2323
module_adjust.create(adjustConfig);
2424
};
2525

26-
Adjust.trackEvent = function (adjustEvent) {
26+
Adjust.trackEvent = function(adjustEvent) {
2727
module_adjust.trackEvent(adjustEvent);
2828
};
2929

‎scripts/build_sdk_android.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ def build(root_dir, android_submodule_dir, with_test_lib, is_release = True):
5555
# Moving the generated Android SDK JAR from jar in to jar out dir ...
5656
debug_green('Moving the generated Android SDK JAR from {0} to {1} dir ...'.format(test_jar_in_dir, test_jar_out_dir))
5757
copy_files('test-library-debug.jar', test_jar_in_dir, test_jar_out_dir)
58-
rename_file('test-library-debug.jar', 'adjust-testing.jar', test_jar_out_dir)
58+
rename_file('test-library-debug.jar', 'adjust-test.jar', test_jar_out_dir)

‎scripts/build_sdk_ios.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
def build(root_dir, ios_submodule_dir, with_test_lib):
55
# ------------------------------------------------------------------
66
# paths
7-
src_dir = '{0}/sdk/Adjust'.format(ios_submodule_dir)
8-
src_out_dir = '{0}/ios/Adjust'.format(root_dir)
7+
src_dir = '{0}/sdk/Adjust'.format(ios_submodule_dir)
8+
src_out_dir = '{0}/ios/Adjust'.format(root_dir)
99

1010
# ------------------------------------------------------------------
1111
# Copying iOS SDK source files from src in dir to src out dir ...
@@ -17,7 +17,6 @@ def build(root_dir, ios_submodule_dir, with_test_lib):
1717
# Test Library paths
1818
set_log_tag('IOS-TEST-LIB-BUILD')
1919
debug_green('Building Test Library started ...')
20-
waiting_animation(duration=1.5, step=0.025)
2120
test_lib_in_dir = '{0}/sdk/AdjustTests/AdjustTestLibrary/AdjustTestLibrary/'.format(ios_submodule_dir)
2221
test_lib_out_dir = '{0}/test/lib/ios/AdjustTestLibrary/'.format(root_dir)
2322

‎test/app/App.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
var baseUrl = "";
4545
var gdprUrl = "";
4646
if (Platform.OS === "android") {
47-
baseUrl = "https://192.168.8.153:8443";
48-
gdprUrl = "https://192.168.8.153:8443";
47+
baseUrl = "https://192.168.8.197:8443";
48+
gdprUrl = "https://192.168.8.197:8443";
4949
} else if (Platform.OS === "ios") {
50-
baseUrl = "http://192.168.8.153:8080";
51-
gdprUrl = "http://192.168.8.153:8080";
50+
baseUrl = "http://192.168.8.197:8080";
51+
gdprUrl = "http://192.168.8.197:8080";
5252
}
5353

5454
// AdjustSdkTest.addTestDirectory("current/appSecret/");
@@ -63,7 +63,6 @@
6363
const functionName = json["functionName"];
6464
const params = json["params"];
6565
const order = json["order"];
66-
6766
commandExecutor.scheduleCommand(className, functionName, params, order);
6867
});
6968
}

‎test/app/command_executor.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -592,8 +592,7 @@ AdjustCommandExecutor.prototype.sendReferrer = function(params) {
592592
Adjust.setReferrer(referrer);
593593
};
594594

595-
//Util
596-
//======================
595+
// Util
597596
function getValueFromKey(params, key) {
598597
if (key in params) {
599598
return params[key];
@@ -613,5 +612,3 @@ function getFirstParameterValue(params, key) {
613612

614613
return null;
615614
}
616-
617-
//export default CommandExecutor;

‎test/app/ios/AdjustTest.xcodeproj/project.pbxproj‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; };
3636
2DCD954D1E0B4F2C00145EB5 /* AdjustTestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* AdjustTestTests.m */; };
3737
2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
38-
49F81C14FAB549109BCA784C /* libAdjustSdk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CBFB6C5A5BD24022A678A132 /* libAdjustSdk.a */; };
3938
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
4039
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
40+
8C0C8C47992B4F37B88374A4 /* libAdjustSdk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ED7D1815C9754C6883D97170 /* libAdjustSdk.a */; };
4141
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
42-
C29AC5A514734C5B965F9DD9 /* libAdjustSdkTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4424D9ADE1CC453B8E1FFC8D /* libAdjustSdkTest.a */; };
42+
DFBC516EF1BC484695B2813F /* libAdjustSdkTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B1622E97767541AD9D5C19AA /* libAdjustSdkTest.a */; };
4343
/* End PBXBuildFile section */
4444

4545
/* Begin PBXContainerItemProxy section */
@@ -309,16 +309,16 @@
309309
remoteGlobalIDString = 58B5119B1A9E6C1200147676;
310310
remoteInfo = RCTText;
311311
};
312-
9D43A26521C004EC00B2956F /* PBXContainerItemProxy */ = {
312+
9DEC33EE21C13E9400937C4D /* PBXContainerItemProxy */ = {
313313
isa = PBXContainerItemProxy;
314-
containerPortal = F9339376DD4D476A96233404 /* AdjustSdk.xcodeproj */;
314+
containerPortal = E1B43F76C77B45C2B97B29BC /* AdjustSdk.xcodeproj */;
315315
proxyType = 2;
316316
remoteGlobalIDString = 134814201AA4EA6300B7C361;
317317
remoteInfo = AdjustSdk;
318318
};
319-
9D43A26A21C004EC00B2956F /* PBXContainerItemProxy */ = {
319+
9DEC33F121C13E9400937C4D /* PBXContainerItemProxy */ = {
320320
isa = PBXContainerItemProxy;
321-
containerPortal = D3BCF74AC7814DE6A0688A04 /* AdjustSdkTest.xcodeproj */;
321+
containerPortal = 47BF8CED53724E80B52CA5DC /* AdjustSdkTest.xcodeproj */;
322322
proxyType = 2;
323323
remoteGlobalIDString = 9D13E90120CE887F00B58F3A;
324324
remoteInfo = AdjustSdkTest;
@@ -355,14 +355,14 @@
355355
2D02E47B1E0B4A5D006451C7 /* AdjustTest-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "AdjustTest-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
356356
2D02E4901E0B4A5D006451C7 /* AdjustTest-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AdjustTest-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
357357
2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
358-
4424D9ADE1CC453B8E1FFC8D /* libAdjustSdkTest.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libAdjustSdkTest.a; sourceTree = "<group>"; };
358+
47BF8CED53724E80B52CA5DC /* AdjustSdkTest.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = AdjustSdkTest.xcodeproj; path = "../node_modules/react-native-adjust-test/ios/AdjustSdkTest.xcodeproj"; sourceTree = "<group>"; };
359359
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
360360
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
361361
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
362362
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
363-
CBFB6C5A5BD24022A678A132 /* libAdjustSdk.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libAdjustSdk.a; sourceTree = "<group>"; };
364-
D3BCF74AC7814DE6A0688A04 /* AdjustSdkTest.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = AdjustSdkTest.xcodeproj; path = "../node_modules/react-native-adjust-test/ios/AdjustSdkTest.xcodeproj"; sourceTree = "<group>"; };
365-
F9339376DD4D476A96233404 /* AdjustSdk.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = AdjustSdk.xcodeproj; path = "../node_modules/react-native-adjust/ios/AdjustSdk.xcodeproj"; sourceTree = "<group>"; };
363+
B1622E97767541AD9D5C19AA /* libAdjustSdkTest.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libAdjustSdkTest.a; sourceTree = "<group>"; };
364+
E1B43F76C77B45C2B97B29BC /* AdjustSdk.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = AdjustSdk.xcodeproj; path = "../node_modules/react-native-adjust/ios/AdjustSdk.xcodeproj"; sourceTree = "<group>"; };
365+
ED7D1815C9754C6883D97170 /* libAdjustSdk.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libAdjustSdk.a; sourceTree = "<group>"; };
366366
/* End PBXFileReference section */
367367

368368
/* Begin PBXFrameworksBuildPhase section */
@@ -391,8 +391,8 @@
391391
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
392392
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
393393
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
394-
49F81C14FAB549109BCA784C /* libAdjustSdk.a in Frameworks */,
395-
C29AC5A514734C5B965F9DD9 /* libAdjustSdkTest.a in Frameworks */,
394+
8C0C8C47992B4F37B88374A4 /* libAdjustSdk.a in Frameworks */,
395+
DFBC516EF1BC484695B2813F /* libAdjustSdkTest.a in Frameworks */,
396396
);
397397
runOnlyForDeploymentPostprocessing = 0;
398398
};
@@ -579,8 +579,8 @@
579579
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
580580
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
581581
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
582-
F9339376DD4D476A96233404 /* AdjustSdk.xcodeproj */,
583-
D3BCF74AC7814DE6A0688A04 /* AdjustSdkTest.xcodeproj */,
582+
E1B43F76C77B45C2B97B29BC /* AdjustSdk.xcodeproj */,
583+
47BF8CED53724E80B52CA5DC /* AdjustSdkTest.xcodeproj */,
584584
);
585585
name = Libraries;
586586
sourceTree = "<group>";
@@ -623,24 +623,24 @@
623623
9D13E7DF20CE7B2300B58F3A /* Recovered References */ = {
624624
isa = PBXGroup;
625625
children = (
626-
CBFB6C5A5BD24022A678A132 /* libAdjustSdk.a */,
627-
4424D9ADE1CC453B8E1FFC8D /* libAdjustSdkTest.a */,
626+
ED7D1815C9754C6883D97170 /* libAdjustSdk.a */,
627+
B1622E97767541AD9D5C19AA /* libAdjustSdkTest.a */,
628628
);
629629
name = "Recovered References";
630630
sourceTree = "<group>";
631631
};
632-
9D43A26221C004EC00B2956F /* Products */ = {
632+
9DEC33E921C13E9400937C4D /* Products */ = {
633633
isa = PBXGroup;
634634
children = (
635-
9D43A26621C004EC00B2956F /* libAdjustSdk.a */,
635+
9DEC33EF21C13E9400937C4D /* libAdjustSdk.a */,
636636
);
637637
name = Products;
638638
sourceTree = "<group>";
639639
};
640-
9D43A26721C004EC00B2956F /* Products */ = {
640+
9DEC33EB21C13E9400937C4D /* Products */ = {
641641
isa = PBXGroup;
642642
children = (
643-
9D43A26B21C004EC00B2956F /* libAdjustSdkTest.a */,
643+
9DEC33F221C13E9400937C4D /* libAdjustSdkTest.a */,
644644
);
645645
name = Products;
646646
sourceTree = "<group>";
@@ -769,12 +769,12 @@
769769
projectDirPath = "";
770770
projectReferences = (
771771
{
772-
ProductGroup = 9D43A26221C004EC00B2956F /* Products */;
773-
ProjectRef = F9339376DD4D476A96233404 /* AdjustSdk.xcodeproj */;
772+
ProductGroup = 9DEC33E921C13E9400937C4D /* Products */;
773+
ProjectRef = E1B43F76C77B45C2B97B29BC /* AdjustSdk.xcodeproj */;
774774
},
775775
{
776-
ProductGroup = 9D43A26721C004EC00B2956F /* Products */;
777-
ProjectRef = D3BCF74AC7814DE6A0688A04 /* AdjustSdkTest.xcodeproj */;
776+
ProductGroup = 9DEC33EB21C13E9400937C4D /* Products */;
777+
ProjectRef = 47BF8CED53724E80B52CA5DC /* AdjustSdkTest.xcodeproj */;
778778
},
779779
{
780780
ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
@@ -1088,18 +1088,18 @@
10881088
remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */;
10891089
sourceTree = BUILT_PRODUCTS_DIR;
10901090
};
1091-
9D43A26621C004EC00B2956F /* libAdjustSdk.a */ = {
1091+
9DEC33EF21C13E9400937C4D /* libAdjustSdk.a */ = {
10921092
isa = PBXReferenceProxy;
10931093
fileType = archive.ar;
10941094
path = libAdjustSdk.a;
1095-
remoteRef = 9D43A26521C004EC00B2956F /* PBXContainerItemProxy */;
1095+
remoteRef = 9DEC33EE21C13E9400937C4D /* PBXContainerItemProxy */;
10961096
sourceTree = BUILT_PRODUCTS_DIR;
10971097
};
1098-
9D43A26B21C004EC00B2956F /* libAdjustSdkTest.a */ = {
1098+
9DEC33F221C13E9400937C4D /* libAdjustSdkTest.a */ = {
10991099
isa = PBXReferenceProxy;
11001100
fileType = archive.ar;
11011101
path = libAdjustSdkTest.a;
1102-
remoteRef = 9D43A26A21C004EC00B2956F /* PBXContainerItemProxy */;
1102+
remoteRef = 9DEC33F121C13E9400937C4D /* PBXContainerItemProxy */;
11031103
sourceTree = BUILT_PRODUCTS_DIR;
11041104
};
11051105
ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */ = {

‎test/app/yarn.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4166,7 +4166,7 @@ react-is@^16.3.1:
41664166
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.4.0.tgz#cc9fdc855ac34d2e7d9d2eb7059bbc240d35ffcf"
41674167

41684168
react-native-adjust-test@../lib:
4169-
version "1.0.0"
4169+
version "4.17.0"
41704170

41714171
react-native-adjust@../../temp:
41724172
version "4.17.0"

‎test/lib/android/build.gradle‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
apply plugin: 'com.android.library'
22

3+
def _ext = rootProject.ext
4+
5+
def _compileSdkVersion = _ext.has('compileSdkVersion') ? _ext.compileSdkVersion : 26
6+
def _buildToolsVersion = _ext.has('buildToolsVersion') ? _ext.buildToolsVersion : "26.0.3"
7+
def _minSdkVersion = _ext.has('minSdkVersion') ? _ext.minSdkVersion : 16
8+
def _targetSdkVersion = _ext.has('targetSdkVersion') ? _ext.targetSdkVersion : 26
9+
310
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.1"
11+
compileSdkVersion _compileSdkVersion
12+
buildToolsVersion _buildToolsVersion
613

714
defaultConfig {
8-
minSdkVersion 16
9-
targetSdkVersion 22
15+
minSdkVersion _minSdkVersion
16+
targetSdkVersion _targetSdkVersion
1017
versionCode 1
1118
versionName "1.0"
1219
}
@@ -19,6 +26,6 @@ android {
1926
}
2027

2128
dependencies {
22-
compile fileTree(dir: 'libs', include: ['*.jar'])
23-
compile 'com.facebook.react:react-native:+'
29+
implementation fileTree(dir: 'libs', include: ['*.jar'])
30+
implementation 'com.facebook.react:react-native:+'
2431
}

‎test/lib/android/src/main/java/com/adjust/test/BundleJSONConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//steal from https://github.com/facebook/facebook-android-sdk/blob/master/facebook/src/main/java/com/facebook/internal/BundleJSONConverter.java
1+
// Taken from https://github.com/facebook/facebook-android-sdk/blob/master/facebook/src/main/java/com/facebook/internal/BundleJSONConverter.java
22

33
/**
44
* Copyright (c) 2014-present, Facebook, Inc. All rights reserved.

0 commit comments

Comments
 (0)