diff --git a/.gitmodules b/.gitmodules index 40bea6a4..b5232300 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,8 @@ [submodule "ext/android/sdk"] path = ext/android/sdk - url = git@github.com:adjust/android_sdk.git + url = https://github.com/adjust/android_sdk.git branch = master [submodule "ext/ios/sdk"] path = ext/ios/sdk - url = git@github.com:adjust/ios_sdk.git + url = https://github.com/adjust/ios_sdk.git branch = master diff --git a/CHANGELOG.md b/CHANGELOG.md index e74f9217..1ea5771f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +### Version 4.18.1 (2nd July 2019) +#### Fixed +- Fixed compile errors when trying to use Adjust SDK with TypeScript 2.9 and higher (thanks to @rawrmaan). + +#### Changed +- Changed submodule endpoints from `SSH` to `HTTPS` (thanks to @rawrmaan). + +#### Native SDKs +- [iOS@v4.18.0][ios_sdk_v4.18.0] +- [Android@v4.18.0][android_sdk_v4.18.0] + +--- + ### Version 4.18.0 (1st July 2019) #### Added - Added `trackAdRevenue` method to `Adjust` interface to allow tracking of ad revenue. With this release added support for `MoPub` ad revenue tracking. diff --git a/VERSION b/VERSION index b30c4dcb..cc84ce74 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.18.0 +4.18.1 diff --git a/android/src/main/java/com/adjust/sdk/Adjust.java b/android/src/main/java/com/adjust/sdk/Adjust.java index a5fcaeb5..8f500d30 100755 --- a/android/src/main/java/com/adjust/sdk/Adjust.java +++ b/android/src/main/java/com/adjust/sdk/Adjust.java @@ -389,7 +389,7 @@ public void trackAdRevenue(String source, String payload) { try { JSONObject jsonPayload = new JSONObject(payload); com.adjust.sdk.Adjust.trackAdRevenue(source, jsonPayload); - }catch (JSONException err){ + } catch (JSONException err) { Log.d(TAG, "Give ad revenue payload is not a valid JSON string"); } } diff --git a/index.d.ts b/index.d.ts index aae1cc3c..71eae3d2 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1,177 +1,155 @@ -declare module "react-native-adjust" { - type Environment = "sandbox" | "production"; - - enum LogLevel { - Verbose, - Debug, - Info, - Warn, - Error, - Assert, - Suppress - } - - interface AdjustAttribution { - trackerToken: string; - trackerName: string; - network: string; - campaign: string; - adgroup: string; - creative: string; - clickLabel: string; - adid: string; - } - - interface AdjustEventTrackingSuccess { - message: string; - timestamp: string; - adid: string; - eventToken: string; - callbackId: string; - jsonResponse: string; - } - - interface AdjustEventTrackingFailure { - message: string; - timestamp: string; - adid: string; - eventToken: string; - callbackId: string; - willRetry: boolean; - jsonResponse: string; - } - - interface AdjustSessionTrackingSuccess { - message: string; - timestamp: string; - adid: string; - jsonResponse: string; - } - - interface AdjustSessionTrackingFailure { - message: string; - timestamp: string; - adid: string; - willRetry: boolean; - jsonResponse: string; - } - - interface AdjustUri { - uri: string; - } - - export class AdjustConfig { - constructor(appToken: string, environment: Environment) { } - - public setLogLevel(level: LogLevel): void { } - - public setEventBufferingEnabled(isEnabled: boolean): void { } - - public setProcessName(processName: string): void { } - - public setDefaultTracker(defaultTracked: string): void { } - - public setUserAgent(userAgent: string): void { } - - public setAppSecret(secretId: number, info1: number, info2: number, info3: number, info4: number): void { } - - public setDelayStart(delayStart: number): void { } - - public setSendInBackground(sendInBackground: boolean): void { } - - public setDeviceKnown(isDeviceKnown: boolean): void { } - - public setSdkPrefix(sdkPrefix: string): void { } - - public setShouldLaunchDeeplink(shouldLaunchDeeplink: boolean): void { } - - public setAttributionCallbackListener(callback: (attribution: AdjustAttribution) => void): void { } - - public setEventTrackingSucceededCallbackListener(callback: (eventSuccess: AdjustEventTrackingSuccess) => void): void { } - - public setEventTrackingFailedCallbackListener(callback: (eventFailed: AdjustEventTrackingFailure) => void): void { } - - public setSessionTrackingSucceededCallbackListener(callback: (sessionSuccess: AdjustSessionTrackingSuccess) => void): void { } - - public setSessionTrackingFailedCallbackListener(callback: (sessionFailed: AdjustSessionTrackingFailure) => void): void { } - - public setDeferredDeeplinkCallbackListener(callback: (uri: AdjustUri) => void): void { } - - static get LogLevelVerbose(): LogLevel { - return LogLevel.Verbose; - } - - static get LogLevelDebug(): LogLevel { - return LogLevel.Debug; - } - - static get LogLevelInfo(): LogLevel { - return LogLevel.Info; - } - - static get LogLevelWarn(): LogLevel { - return LogLevel.Warn; - } - - static get LogLevelError(): LogLevel { - return LogLevel.Error; - } - - static get LogLevelAssert(): LogLevel { - return LogLevel.Assert; - } - - static get LogLevelSuppress(): LogLevel { - return LogLevel.Suppress; - } - - static get EnvironmentSandbox(): Environment { - return "sandbox"; - } - - static get EnvironmentProduction(): Environment { - return "production"; - } - } - - export class AdjustEvent { - constructor(eventToken: string) { } - - public setRevenue(revenue: number, currency: string): void { } - - public addCallbackParameter(key: string, value: string): void { } - - public addPartnerParameter(key: string, value: string): void { } - - public setTransactionId(transactionId: string): void { } - - public setCallbackId(callbackId: string): void { } - } - - export const Adjust = { - componentWillUnmount: (): void => { }, - create: (adjustConfig: AdjustConfig): void => { }, - trackEvent: (adjustEvent: AdjustEvent): void => { }, - setEnabled: (enabled: boolean): void => { }, - isEnabled: (callback: (enabled: boolean) => void): void => { }, - setOfflineMode: (enabled: boolean): void => { }, - setPushToken: (token: string): void => { }, - appWillOpenUrl: (url: string): void => { }, - sendFirstPackages: (): void => { }, - trackAdRevenue: (source: string, payload: string): void => { }, - addSessionCallbackParameter: (key: string, value: string): void => { }, - addSessionPartnerParameter: (key: string, value: string): void => { }, - removeSessionCallbackParameter: (key: string): void => { }, - removeSessionPartnerParameter: (key: string): void => { }, - resetSessionCallbackParameters: (): void => { }, - resetSessionPartnerParameters: (): void => { }, - gdprForgetMe: (): void => { }, - getIdfa: (callback: (idfa: string) => void): void => { }, - getGoogleAdId: (callback: (adid: string) => void): void => { }, - getAdid: (callback: (adid: string) => void): void => { }, - getAttribution: (callback: (attribution: AdjustAttribution) => void): void => { }, - getAmazonAdId: (callback: (adid: string) => void): void => { }, - getSdkVersion: (callback: (sdkVersion: string) => void): void => { }, - setReferrer: (referrer: string): void => { }, - }; +declare module 'react-native-adjust' { + type Environment = 'sandbox' | 'production' + type LogLevel = string + + interface AdjustAttribution { + trackerToken: string + trackerName: string + network: string + campaign: string + adgroup: string + creative: string + clickLabel: string + adid: string + } + + interface AdjustEventTrackingSuccess { + message: string + timestamp: string + adid: string + eventToken: string + callbackId: string + jsonResponse: string + } + + interface AdjustEventTrackingFailure { + message: string + timestamp: string + adid: string + eventToken: string + callbackId: string + willRetry: boolean + jsonResponse: string + } + + interface AdjustSessionTrackingSuccess { + message: string + timestamp: string + adid: string + jsonResponse: string + } + + interface AdjustSessionTrackingFailure { + message: string + timestamp: string + adid: string + willRetry: boolean + jsonResponse: string + } + + interface AdjustUri { + uri: string + } + + export class AdjustConfig { + constructor(appToken: string, environment: Environment) + + public setLogLevel(level: LogLevel): void + + public setEventBufferingEnabled(isEnabled: boolean): void + + public setProcessName(processName: string): void + + public setDefaultTracker(defaultTracked: string): void + + public setUserAgent(userAgent: string): void + + public setAppSecret( + secretId: number, + info1: number, + info2: number, + info3: number, + info4: number + ): void + + public setDelayStart(delayStart: number): void + + public setSendInBackground(sendInBackground: boolean): void + + public setDeviceKnown(isDeviceKnown: boolean): void + + public setSdkPrefix(sdkPrefix: string): void + + public setShouldLaunchDeeplink(shouldLaunchDeeplink: boolean): void + + public setAttributionCallbackListener( + callback: (attribution: AdjustAttribution) => void + ): void + + public setEventTrackingSucceededCallbackListener( + callback: (eventSuccess: AdjustEventTrackingSuccess) => void + ): void + + public setEventTrackingFailedCallbackListener( + callback: (eventFailed: AdjustEventTrackingFailure) => void + ): void + + public setSessionTrackingSucceededCallbackListener( + callback: (sessionSuccess: AdjustSessionTrackingSuccess) => void + ): void + + public setSessionTrackingFailedCallbackListener( + callback: (sessionFailed: AdjustSessionTrackingFailure) => void + ): void + + public setDeferredDeeplinkCallbackListener( + callback: (uri: AdjustUri) => void + ): void + + static LogLevelVerbose: LogLevel + static LogLevelDebug: LogLevel + static LogLevelInfo: LogLevel + static LogLevelWarn: LogLevel + static LogLevelError: LogLevel + static LogLevelAssert: LogLevel + static LogLevelSuppress: LogLevel + static EnvironmentSandbox: Environment + static EnvironmentProduction: Environment + } + + export class AdjustEvent { + constructor(eventToken: string) + public setRevenue(revenue: number, currency: string): void + public addCallbackParameter(key: string, value: string): void + public addPartnerParameter(key: string, value: string): void + public setTransactionId(transactionId: string): void + public setCallbackId(callbackId: string): void + } + + export const Adjust: { + componentWillUnmount: () => void + create: (adjustConfig: AdjustConfig) => void + trackEvent: (adjustEvent: AdjustEvent) => void + setEnabled: (enabled: boolean) => void + isEnabled: (callback: (enabled: boolean) => void) => void + setOfflineMode: (enabled: boolean) => void + setPushToken: (token: string) => void + appWillOpenUrl: (url: string) => void + sendFirstPackages: () => void + trackAdRevenue: (source: string, payload: string) => void + addSessionCallbackParameter: (key: string, value: string) => void + addSessionPartnerParameter: (key: string, value: string) => void + removeSessionCallbackParameter: (key: string) => void + removeSessionPartnerParameter: (key: string) => void + resetSessionCallbackParameters: () => void + resetSessionPartnerParameters: () => void + gdprForgetMe: () => void + getIdfa: (callback: (idfa: string) => void) => void + getGoogleAdId: (callback: (adid: string) => void) => void + getAdid: (callback: (adid: string) => void) => void + getAttribution: (callback: (attribution: AdjustAttribution) => void) => void + getAmazonAdId: (callback: (adid: string) => void) => void + getSdkVersion: (callback: (sdkVersion: string) => void) => void + setReferrer: (referrer: string) => void + } } diff --git a/index.js b/index.js index e74de626..e4638ae5 100755 --- a/index.js +++ b/index.js @@ -110,7 +110,7 @@ Adjust.getAmazonAdId = function(callback) { }; Adjust.getSdkVersion = function(callback) { - module_adjust.getSdkVersion("react-native4.18.0", callback); + module_adjust.getSdkVersion("react-native4.18.1", callback); } Adjust.setReferrer = function(referrer) { @@ -183,7 +183,7 @@ Adjust.onPause = function(testParam) { // AdjustConfig var AdjustConfig = function(appToken, environment) { - this.sdkPrefix = "react-native4.18.0"; + this.sdkPrefix = "react-native4.18.1"; this.appToken = appToken; this.environment = environment; this.logLevel = null; diff --git a/package.json b/package.json index d7f6f026..8b465d0d 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "react-native-adjust", "description": "Adjust React Native SDK", - "version": "4.18.0", + "version": "4.18.1", "main": "index.js", - "author": "adjust GmbH", + "author": "Adjust GmbH", "license": "MIT", "keywords": [ "react-native", diff --git a/test/app/yarn.lock b/test/app/yarn.lock index 4649b399..3b566736 100644 --- a/test/app/yarn.lock +++ b/test/app/yarn.lock @@ -4859,10 +4859,10 @@ react-is@^16.8.1, react-is@^16.8.3, react-is@^16.8.4: integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA== react-native-adjust-test@../lib: - version "4.18.0" + version "4.18.1" react-native-adjust@../../temp: - version "4.18.0" + version "4.18.1" react-native@0.59.9: version "0.59.9" diff --git a/test/lib/package.json b/test/lib/package.json index 330971ee..5ff7ce26 100644 --- a/test/lib/package.json +++ b/test/lib/package.json @@ -1,8 +1,8 @@ { "name": "react-native-adjust-test", "description": "Adjust Test Plugin For React Native SDK", - "version": "4.18.0", - "author": "adjust GmbH", + "version": "4.18.1", + "author": "Adjust GmbH", "license": "MIT", "keywords": [ "react-native",