diff --git a/.gitmodules b/.gitmodules index f634d39b..0e9165cf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,24 @@ -[submodule "ext/Android/sdk"] - path = ext/Android/sdk +[submodule "ext/android/sdk"] + path = ext/android/sdk url = git@github.com:adjust/android_sdk.git - branch = master -[submodule "ext/iOS/sdk"] - path = ext/iOS/sdk + branch = master +[submodule "ext/ios/sdk"] + path = ext/ios/sdk url = git@github.com:adjust/ios_sdk.git - branch = master -[submodule "ext/Windows/sdk"] - path = ext/Windows/sdk + branch = master +[submodule "ext/windows/sdk"] + path = ext/windows/sdk url = git@github.com:adjust/windows_sdk.git - branch = master + branch = master +[submodule "ext/android/sdk-dev"] + path = ext/android/sdk-dev + url = git@github.com:adjust/android_sdk_dev.git + branch = master +[submodule "ext/ios/sdk-dev"] + path = ext/ios/sdk-dev + url = git@github.com:adjust/ios_sdk_dev.git + branch = master +[submodule "ext/windows/sdk-dev"] + path = ext/windows/sdk-dev + url = git@github.com:adjust/windows_sdk_dev.git + branch = master diff --git a/Assets/Adjust/Android/AdjustAndroid.cs b/Assets/Adjust/Android/AdjustAndroid.cs index 6e5eeba8..9bf79254 100644 --- a/Assets/Adjust/Android/AdjustAndroid.cs +++ b/Assets/Adjust/Android/AdjustAndroid.cs @@ -10,7 +10,7 @@ namespace com.adjust.sdk #if UNITY_ANDROID public class AdjustAndroid { - private const string sdkPrefix = "unity4.14.0"; + private const string sdkPrefix = "unity4.14.1"; private static bool launchDeferredDeeplink = true; private static AndroidJavaClass ajcAdjust = new AndroidJavaClass("com.adjust.sdk.Adjust"); diff --git a/Assets/Adjust/Test/TestApp.cs b/Assets/Adjust/Test/TestApp.cs index 3b84c567..868176bd 100644 --- a/Assets/Adjust/Test/TestApp.cs +++ b/Assets/Adjust/Test/TestApp.cs @@ -10,17 +10,17 @@ public class TestApp : MonoBehaviour public static readonly string TAG = "[TestApp]"; #if (UNITY_WSA || UNITY_WP8) - public const string CLIENT_SDK = "unity4.14.0@wuap4.14.0"; + public const string CLIENT_SDK = "unity4.14.1@wuap4.14.0"; private const string PORT = ":8080"; private const string PROTOCOL = "http://"; private const string BASE_URL = PROTOCOL + "localhost" + PORT; // Windows simulator #elif UNITY_ANDROID - public const string CLIENT_SDK = "unity4.14.0@android4.14.0"; + public const string CLIENT_SDK = "unity4.14.1@android4.14.0"; private const string PORT = ":8443"; private const string PROTOCOL = "https://"; private const string BASE_URL = PROTOCOL + "10.0.2.2" + PORT; // Android simulator #elif UNITY_IOS - public const string CLIENT_SDK = "unity4.14.0@ios4.14.0"; + public const string CLIENT_SDK = "unity4.14.1@ios4.14.1"; private const string PORT = ":8080"; private const string PROTOCOL = "http://"; private const string BASE_URL = PROTOCOL + "127.0.0.1" + PORT; // iOS simulator diff --git a/Assets/Adjust/Windows/AdjustWindows.cs b/Assets/Adjust/Windows/AdjustWindows.cs index 26568b52..1d76a004 100644 --- a/Assets/Adjust/Windows/AdjustWindows.cs +++ b/Assets/Adjust/Windows/AdjustWindows.cs @@ -17,7 +17,7 @@ namespace com.adjust.sdk { public class AdjustWindows { - private const string sdkPrefix = "unity4.14.0"; + private const string sdkPrefix = "unity4.14.1"; private static bool appLaunched = false; public static void Start(AdjustConfig adjustConfig) diff --git a/Assets/Adjust/iOS/Adjust.h b/Assets/Adjust/iOS/Adjust.h index 4024c7b9..a6fc0c5e 100644 --- a/Assets/Adjust/iOS/Adjust.h +++ b/Assets/Adjust/iOS/Adjust.h @@ -2,7 +2,7 @@ // Adjust.h // Adjust // -// V4.14.0 +// V4.14.1 // Created by Christian Wellenbrock (wellle) on 23rd July 2013. // Copyright © 2012-2017 Adjust GmbH. All rights reserved. // @@ -105,10 +105,18 @@ extern NSString * __nonnull const ADJEnvironmentProduction; /** * @brief Set the device token used by push notifications. * - * @param deviceToken Apple push notification token for iOS device. + * @param deviceToken Apple push notification token for iOS device as NSData. */ + (void)setDeviceToken:(nonnull NSData *)deviceToken; +/** + * @brief Set the device token used by push notifications. + * This method is only used by Adjust non native SDKs. Don't use it anywhere else. + * + * @param pushToken Apple push notification token for iOS device as NSString. + */ ++ (void)setPushToken:(nonnull NSString *)pushToken; + /** * @brief Enable or disable offline mode. Activities won't be sent but they are saved when * offline mode is disabled. This feature is not saved for future sessions. @@ -234,6 +242,8 @@ extern NSString * __nonnull const ADJEnvironmentProduction; - (void)setDeviceToken:(nonnull NSData *)deviceToken; +- (void)setPushToken:(nonnull NSString *)pushToken; + - (void)sendFirstPackages; - (void)trackSubsessionEnd; diff --git a/Assets/Adjust/iOS/AdjustSdk.a b/Assets/Adjust/iOS/AdjustSdk.a index 77ce56ff..cd3dede1 100644 Binary files a/Assets/Adjust/iOS/AdjustSdk.a and b/Assets/Adjust/iOS/AdjustSdk.a differ diff --git a/Assets/Adjust/iOS/AdjustTestLibrary.a b/Assets/Adjust/iOS/AdjustTestLibrary.a index c8001ba7..55c8e3ab 100644 Binary files a/Assets/Adjust/iOS/AdjustTestLibrary.a and b/Assets/Adjust/iOS/AdjustTestLibrary.a differ diff --git a/Assets/Adjust/iOS/AdjustUnity.mm b/Assets/Adjust/iOS/AdjustUnity.mm index 0886c422..ec315bd3 100644 --- a/Assets/Adjust/iOS/AdjustUnity.mm +++ b/Assets/Adjust/iOS/AdjustUnity.mm @@ -275,7 +275,7 @@ void _AdjustSetOfflineMode(int enabled) { void _AdjustSetDeviceToken(const char* deviceToken) { NSString *stringDeviceToken = [NSString stringWithUTF8String:deviceToken]; - [Adjust setDeviceToken:[stringDeviceToken dataUsingEncoding:NSUTF8StringEncoding]]; + [Adjust setPushToken:stringDeviceToken]; } void _AdjustAppWillOpenUrl(const char* url) { diff --git a/Assets/Adjust/iOS/AdjustiOS.cs b/Assets/Adjust/iOS/AdjustiOS.cs index cee4b3b5..d61f8945 100644 --- a/Assets/Adjust/iOS/AdjustiOS.cs +++ b/Assets/Adjust/iOS/AdjustiOS.cs @@ -10,7 +10,7 @@ namespace com.adjust.sdk #if UNITY_IOS public class AdjustiOS { - private const string sdkPrefix = "unity4.14.0"; + private const string sdkPrefix = "unity4.14.1"; [DllImport("__Internal")] private static extern void _AdjustLaunchApp( diff --git a/CHANGELOG.md b/CHANGELOG.md index c0fafc38..92783bcc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +### Version 4.14.1 (18th June 2018) +#### Changed +- Updated the way how iOS native bridge handles push tokens from Unity interface - they are now being passed directly as strings to native iOS SDK. + +#### Native SDKs +- [iOS@v4.14.1][ios_sdk_v4.14.1] +- [Android@v4.14.0][android_sdk_v4.14.0] +- [Windows@v4.14.0][windows_sdk_v4.14.0] + +--- + ### Version 4.14.0 (8th June 2018) #### Added - Added deep link caching in case `appWillOpenUrl`/`AppWillOpenUrl` method is called natively before SDK is initialised. @@ -496,6 +507,7 @@ [ios_sdk_v4.12.3]: https://github.com/adjust/ios_sdk/tree/v4.12.3 [ios_sdk_v4.13.0]: https://github.com/adjust/ios_sdk/tree/v4.13.0 [ios_sdk_v4.14.0]: https://github.com/adjust/ios_sdk/tree/v4.14.0 +[ios_sdk_v4.14.1]: https://github.com/adjust/ios_sdk/tree/v4.14.1 [android_sdk_v3.5.0]: https://github.com/adjust/android_sdk/tree/v3.5.0 [android_sdk_v4.1.0]: https://github.com/adjust/android_sdk/tree/v4.1.0 diff --git a/VERSION b/VERSION index c412a4e2..d2b9909a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.14.0 +4.14.1 diff --git a/doc/migrate.md b/doc/migrate.md index 93ba8bfc..f81a4df8 100644 --- a/doc/migrate.md +++ b/doc/migrate.md @@ -1,4 +1,4 @@ -## Migrate your Adjust SDK for Unity3d to 4.14.0 from 3.4.4 +## Migrate your Adjust SDK for Unity3d to 4.14.1 from 3.4.4 ### Migration procedure @@ -9,7 +9,7 @@ keeping in `Assets/Plugins` folder. For migration purposes, we have prepared the Adjust SDK uninstall script written in Python (`adjust_uninstall.py`). -Migration to version 4.14.0 of our SDK requires the following steps: +Migration to version 4.14.1 of our SDK requires the following steps: 1. Copy the `adjust_uninstall.py` script to your root Unity project directory and run it. This script should delete all adjust source files from the previous SDK version you had. diff --git a/ext/Android/build.sh b/ext/Android/build.sh deleted file mode 100755 index b1a90180..00000000 --- a/ext/Android/build.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -set -e - -MVNDIR=./sdk/Adjust -JARINDIR=./sdk/Adjust/target -JAROUTDIR=../../Assets/Adjust/Android - -(cd $MVNDIR; mvn clean) -(cd $MVNDIR; mvn package) - -rm -v $JAROUTDIR/adjust-android* -cp -v $JARINDIR/adjust-android-*.*.*.jar $JAROUTDIR -rm -v $JAROUTDIR/*-javadoc.jar -rm -v $JAROUTDIR/*-sources.jar -mv -v $JAROUTDIR/adjust-android-*.*.*.jar $JAROUTDIR/adjust-android.jar diff --git a/ext/Android/build_test_ci.sh b/ext/Android/build_test_ci.sh deleted file mode 100755 index 67cd5668..00000000 --- a/ext/Android/build_test_ci.sh +++ /dev/null @@ -1,26 +0,0 @@ -# End script if one of the lines fails -# set -e - -# Get the current directory (ext/android/) -SDK_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# Traverse up to get to the root directory -SDK_DIR="$(dirname "$SDK_DIR")" -SDK_DIR="$(dirname "$SDK_DIR")" -BUILD_DIR=sdk/Adjust -JAR_IN_DIR=testlibrary/build/outputs -JAR_OUT_DIR=Assets/Adjust/Android - -RED='\033[0;31m' # Red color -GREEN='\033[0;32m' # Green color -NC='\033[0m' # No Color - -# cd to the called directory to be able to run the script from anywhere -cd $(dirname $0) - -cd $BUILD_DIR -echo -e "${GREEN}>>> Running Gradle tasks: clean makeJar ${NC}" -./gradlew clean :testlibrary:makeJar - -echo -e "${GREEN}>>> Moving the ci testing jar from ${JAR_IN_DIR} to ${JAR_OUT_DIR} ${NC}" -mv -v ${JAR_IN_DIR}/*.jar ${SDK_DIR}/${JAR_OUT_DIR}/adjust-testing.jar diff --git a/ext/android/build-dev-sdk.sh b/ext/android/build-dev-sdk.sh new file mode 100755 index 00000000..3ce99dbb --- /dev/null +++ b/ext/android/build-dev-sdk.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash + +set -e + +# ======================================== # + +# Colors for output +NC='\033[0m' +RED='\033[0;31m' +CYAN='\033[1;36m' +GREEN='\033[0;32m' + +# ======================================== # + +# Set directories of interest for the script +MVNDIR=./sdk-dev/Adjust +JARINDIR=./sdk-dev/Adjust/target +JAROUTDIR=../../Assets/Adjust/Android +(cd $MVNDIR; mvn clean) +(cd $MVNDIR; mvn package) + +# ======================================== # + +echo -e "${CYAN}[ADJUST][ANDROID][BUILD-DEV-SDK]:${GREEN} Previous SDK JAR cleanup and generating new one ... ${NC}" +rm -v $JAROUTDIR/adjust-android* +cp -v $JARINDIR/adjust-android-*.*.*.jar $JAROUTDIR +rm -v $JAROUTDIR/*-javadoc.jar +rm -v $JAROUTDIR/*-sources.jar +mv -v $JAROUTDIR/adjust-android-*.*.*.jar $JAROUTDIR/adjust-android.jar +echo -e "${CYAN}[ADJUST][ANDROID][BUILD-DEV-SDK]:${GREEN} Done! ${NC}" + +# ======================================== # + +echo -e "${CYAN}[ADJUST][ANDROID][BUILD-DEV-SDK]:${GREEN} Script completed! ${NC}" + +# ======================================== # \ No newline at end of file diff --git a/ext/android/build-dev-test.sh b/ext/android/build-dev-test.sh new file mode 100755 index 00000000..102b14d1 --- /dev/null +++ b/ext/android/build-dev-test.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -e + +# ======================================== # + +# Colors for output +NC='\033[0m' +RED='\033[0;31m' +CYAN='\033[1;36m' +GREEN='\033[0;32m' + +# ======================================== # + +# Set directories of interest for the script +SDK_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SDK_DIR="$(dirname "$SDK_DIR")" +SDK_DIR="$(dirname "$SDK_DIR")" +BUILD_DIR=sdk-dev/Adjust +JAR_IN_DIR=testlibrary/build/outputs +JAR_OUT_DIR=Assets/Adjust/Android +cd $(dirname $0) + +# ======================================== # + +echo -e "${CYAN}[ADJUST][ANDROID][BUILD-DEV-TEST]:${GREEN} Running Gradle tasks: clean makeJar ... ${NC}" +cd $BUILD_DIR +./gradlew clean :testlibrary:makeJar +echo -e "${CYAN}[ADJUST][ANDROID][BUILD-DEV-TEST]:${GREEN} Done! ${NC}" + +# ======================================== # + +echo -e "${CYAN}[ADJUST][ANDROID][BUILD-DEV-TEST]:${GREEN} Moving test library JAR from ${JAR_IN_DIR} to ${JAR_OUT_DIR} ... ${NC}" +mv -v ${JAR_IN_DIR}/*.jar ${SDK_DIR}/${JAR_OUT_DIR}/adjust-testing.jar +echo -e "${CYAN}[ADJUST][ANDROID][BUILD-DEV-TEST]:${GREEN} Done! ${NC}" + +# ======================================== # + +echo -e "${CYAN}[ADJUST][ANDROID][BUILD-DEV-TEST]:${GREEN} Script completed! ${NC}" + +# ======================================== # \ No newline at end of file diff --git a/ext/android/build-sdk.sh b/ext/android/build-sdk.sh new file mode 100755 index 00000000..f8951b89 --- /dev/null +++ b/ext/android/build-sdk.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash + +set -e + +# ======================================== # + +# Colors for output +NC='\033[0m' +RED='\033[0;31m' +CYAN='\033[1;36m' +GREEN='\033[0;32m' + +# ======================================== # + +# Set directories of interest for the script +MVNDIR=./sdk/Adjust +JARINDIR=./sdk/Adjust/target +JAROUTDIR=../../Assets/Adjust/Android +(cd $MVNDIR; mvn clean) +(cd $MVNDIR; mvn package) + +# ======================================== # + +echo -e "${CYAN}[ADJUST][ANDROID][BUILD-SDK]:${GREEN} Previous SDK JAR cleanup and generating new one ... ${NC}" +rm -v $JAROUTDIR/adjust-android* +cp -v $JARINDIR/adjust-android-*.*.*.jar $JAROUTDIR +rm -v $JAROUTDIR/*-javadoc.jar +rm -v $JAROUTDIR/*-sources.jar +mv -v $JAROUTDIR/adjust-android-*.*.*.jar $JAROUTDIR/adjust-android.jar +echo -e "${CYAN}[ADJUST][ANDROID][BUILD-SDK]:${GREEN} Done! ${NC}" + +# ======================================== # + +echo -e "${CYAN}[ADJUST][ANDROID][BUILD-SDK]:${GREEN} Script completed! ${NC}" + +# ======================================== # \ No newline at end of file diff --git a/ext/android/build-test.sh b/ext/android/build-test.sh new file mode 100755 index 00000000..0b268261 --- /dev/null +++ b/ext/android/build-test.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -e + +# ======================================== # + +# Colors for output +NC='\033[0m' +RED='\033[0;31m' +CYAN='\033[1;36m' +GREEN='\033[0;32m' + +# ======================================== # + +# Set directories of interest for the script +SDK_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SDK_DIR="$(dirname "$SDK_DIR")" +SDK_DIR="$(dirname "$SDK_DIR")" +BUILD_DIR=sdk/Adjust +JAR_IN_DIR=testlibrary/build/outputs +JAR_OUT_DIR=Assets/Adjust/Android +cd $(dirname $0) + +# ======================================== # + +echo -e "${CYAN}[ADJUST][ANDROID][BUILD-TEST]:${GREEN} Running Gradle tasks: clean makeJar ... ${NC}" +cd $BUILD_DIR +./gradlew clean :testlibrary:makeJar +echo -e "${CYAN}[ADJUST][ANDROID][BUILD-TEST]:${GREEN} Done! ${NC}" + +# ======================================== # + +echo -e "${CYAN}[ADJUST][ANDROID][BUILD-TEST]:${GREEN} Moving test library JAR from ${JAR_IN_DIR} to ${JAR_OUT_DIR} ... ${NC}" +mv -v ${JAR_IN_DIR}/*.jar ${SDK_DIR}/${JAR_OUT_DIR}/adjust-testing.jar +echo -e "${CYAN}[ADJUST][ANDROID][BUILD-TEST]:${GREEN} Done! ${NC}" + +# ======================================== # + +echo -e "${CYAN}[ADJUST][ANDROID][BUILD-TEST]:${GREEN} Script completed! ${NC}" + +# ======================================== # \ No newline at end of file diff --git a/ext/Android/sdk b/ext/android/sdk similarity index 100% rename from ext/Android/sdk rename to ext/android/sdk diff --git a/ext/android/sdk-dev b/ext/android/sdk-dev new file mode 160000 index 00000000..f0cc6c57 --- /dev/null +++ b/ext/android/sdk-dev @@ -0,0 +1 @@ +Subproject commit f0cc6c57e28f07753933798ab8f61281b895ee55 diff --git a/ext/iOS/build.sh b/ext/iOS/build.sh deleted file mode 100755 index 4fe5fbcb..00000000 --- a/ext/iOS/build.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -set -e - -SRCDIR=./sdk -LIBOUTDIR=../../Assets/Adjust/iOS - -SDK_STATIC_FRAMEWORK=$SRCDIR/Frameworks/Static/AdjustSdk.framework -TEST_STATIC_FRAMEWORK=$SRCDIR/Frameworks/Static/AdjustTestLibrary.framework - -(cd $SRCDIR; xcodebuild -target AdjustStatic -configuration Release clean build) -cp -v $SDK_STATIC_FRAMEWORK/Versions/A/AdjustSdk $LIBOUTDIR/AdjustSdk.a -cp -v $SDK_STATIC_FRAMEWORK/Versions/A/Headers/* $LIBOUTDIR - -(cd $SRCDIR/AdjustTests/AdjustTestLibrary; xcodebuild -target AdjustTestLibraryStatic -configuration Release clean build) -cp -v $TEST_STATIC_FRAMEWORK/Versions/A/AdjustTestLibrary $LIBOUTDIR/AdjustTestLibrary.a -cp -v $TEST_STATIC_FRAMEWORK/Versions/A/Headers/* $LIBOUTDIR \ No newline at end of file diff --git a/ext/iOS/sdk b/ext/iOS/sdk deleted file mode 160000 index 4c9d7bf1..00000000 --- a/ext/iOS/sdk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4c9d7bf1a1b2942eb8719867c802118098f5d3e9 diff --git a/ext/ios/build-dev.sh b/ext/ios/build-dev.sh new file mode 100755 index 00000000..1af407db --- /dev/null +++ b/ext/ios/build-dev.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -e + +# ======================================== # + +# Colors for output +NC='\033[0m' +RED='\033[0;31m' +CYAN='\033[1;36m' +GREEN='\033[0;32m' + +# ======================================== # + +# Set directories of interest for the script +SRCDIR=./sdk-dev +LIBOUTDIR=../../Assets/Adjust/iOS +SDK_STATIC_FRAMEWORK=$SRCDIR/Frameworks/Static/AdjustSdk.framework +TEST_STATIC_FRAMEWORK=$SRCDIR/Frameworks/Static/AdjustTestLibrary.framework + +# ======================================== # + +echo -e "${CYAN}[ADJUST][IOS][BUILD-DEV]:${GREEN} Building AdjustStatic framework target ... ${NC}" +(cd $SRCDIR; xcodebuild -target AdjustStatic -configuration Release clean build) +cp -v $SDK_STATIC_FRAMEWORK/Versions/A/AdjustSdk $LIBOUTDIR/AdjustSdk.a +cp -v $SDK_STATIC_FRAMEWORK/Versions/A/Headers/* $LIBOUTDIR +echo -e "${CYAN}[ADJUST][IOS][BUILD-DEV]:${GREEN} Done! ${NC}" + +# ======================================== # + +echo -e "${CYAN}[ADJUST][IOS][BUILD-DEV]:${GREEN} Building AdjustTestLibraryStatic framework target ... ${NC}" +(cd $SRCDIR/AdjustTests/AdjustTestLibrary; xcodebuild -target AdjustTestLibraryStatic -configuration Release clean build) +cp -v $TEST_STATIC_FRAMEWORK/Versions/A/AdjustTestLibrary $LIBOUTDIR/AdjustTestLibrary.a +cp -v $TEST_STATIC_FRAMEWORK/Versions/A/Headers/* $LIBOUTDIR +echo -e "${CYAN}[ADJUST][IOS][BUILD-DEV]:${GREEN} Done! ${NC}" + +# ======================================== # + +echo -e "${CYAN}[ADJUST][IOS][BUILD-DEV]:${GREEN} Script completed! ${NC}" + +# ======================================== # \ No newline at end of file diff --git a/ext/ios/build.sh b/ext/ios/build.sh new file mode 100755 index 00000000..a5f62090 --- /dev/null +++ b/ext/ios/build.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -e + +# ======================================== # + +# Colors for output +NC='\033[0m' +RED='\033[0;31m' +CYAN='\033[1;36m' +GREEN='\033[0;32m' + +# ======================================== # + +# Set directories of interest for the script +SRCDIR=./sdk +LIBOUTDIR=../../Assets/Adjust/iOS +SDK_STATIC_FRAMEWORK=$SRCDIR/Frameworks/Static/AdjustSdk.framework +TEST_STATIC_FRAMEWORK=$SRCDIR/Frameworks/Static/AdjustTestLibrary.framework + +# ======================================== # + +echo -e "${CYAN}[ADJUST][IOS][BUILD]:${GREEN} Building AdjustStatic framework target ... ${NC}" +(cd $SRCDIR; xcodebuild -target AdjustStatic -configuration Release clean build) +cp -v $SDK_STATIC_FRAMEWORK/Versions/A/AdjustSdk $LIBOUTDIR/AdjustSdk.a +cp -v $SDK_STATIC_FRAMEWORK/Versions/A/Headers/* $LIBOUTDIR +echo -e "${CYAN}[ADJUST][IOS][BUILD]:${GREEN} Done! ${NC}" + +# ======================================== # + +echo -e "${CYAN}[ADJUST][IOS][BUILD]:${GREEN} Building AdjustTestLibraryStatic framework target ... ${NC}" +(cd $SRCDIR/AdjustTests/AdjustTestLibrary; xcodebuild -target AdjustTestLibraryStatic -configuration Release clean build) +cp -v $TEST_STATIC_FRAMEWORK/Versions/A/AdjustTestLibrary $LIBOUTDIR/AdjustTestLibrary.a +cp -v $TEST_STATIC_FRAMEWORK/Versions/A/Headers/* $LIBOUTDIR +echo -e "${CYAN}[ADJUST][IOS][BUILD]:${GREEN} Done! ${NC}" + +# ======================================== # + +echo -e "${CYAN}[ADJUST][IOS][BUILD]:${GREEN} Script completed! ${NC}" + +# ======================================== # \ No newline at end of file diff --git a/ext/ios/sdk b/ext/ios/sdk new file mode 160000 index 00000000..e207090e --- /dev/null +++ b/ext/ios/sdk @@ -0,0 +1 @@ +Subproject commit e207090eca74885dc1a68a67b868d8e954641ed5 diff --git a/ext/ios/sdk-dev b/ext/ios/sdk-dev new file mode 160000 index 00000000..d4f7f653 --- /dev/null +++ b/ext/ios/sdk-dev @@ -0,0 +1 @@ +Subproject commit d4f7f653de260d65b0066072042167bbf8eb47cc diff --git a/ext/Windows/bridge/WinSdkUnityBridge/Stubs/Win10Stub/Properties/AssemblyInfo.cs b/ext/windows/bridge/WinSdkUnityBridge/Stubs/Win10Stub/Properties/AssemblyInfo.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/Stubs/Win10Stub/Properties/AssemblyInfo.cs rename to ext/windows/bridge/WinSdkUnityBridge/Stubs/Win10Stub/Properties/AssemblyInfo.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/Stubs/Win10Stub/Win10Stub.csproj b/ext/windows/bridge/WinSdkUnityBridge/Stubs/Win10Stub/Win10Stub.csproj similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/Stubs/Win10Stub/Win10Stub.csproj rename to ext/windows/bridge/WinSdkUnityBridge/Stubs/Win10Stub/Win10Stub.csproj diff --git a/ext/Windows/bridge/WinSdkUnityBridge/Stubs/Win81Stub/Properties/AssemblyInfo.cs b/ext/windows/bridge/WinSdkUnityBridge/Stubs/Win81Stub/Properties/AssemblyInfo.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/Stubs/Win81Stub/Properties/AssemblyInfo.cs rename to ext/windows/bridge/WinSdkUnityBridge/Stubs/Win81Stub/Properties/AssemblyInfo.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/Stubs/Win81Stub/Win81Stub.csproj b/ext/windows/bridge/WinSdkUnityBridge/Stubs/Win81Stub/Win81Stub.csproj similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/Stubs/Win81Stub/Win81Stub.csproj rename to ext/windows/bridge/WinSdkUnityBridge/Stubs/Win81Stub/Win81Stub.csproj diff --git a/ext/Windows/bridge/WinSdkUnityBridge/Stubs/WinStub/AdjustConfigDto.cs b/ext/windows/bridge/WinSdkUnityBridge/Stubs/WinStub/AdjustConfigDto.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/Stubs/WinStub/AdjustConfigDto.cs rename to ext/windows/bridge/WinSdkUnityBridge/Stubs/WinStub/AdjustConfigDto.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/Stubs/WinStub/AdjustWinInterface.cs b/ext/windows/bridge/WinSdkUnityBridge/Stubs/WinStub/AdjustWinInterface.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/Stubs/WinStub/AdjustWinInterface.cs rename to ext/windows/bridge/WinSdkUnityBridge/Stubs/WinStub/AdjustWinInterface.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/Stubs/WinStub/Properties/AssemblyInfo.cs b/ext/windows/bridge/WinSdkUnityBridge/Stubs/WinStub/Properties/AssemblyInfo.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/Stubs/WinStub/Properties/AssemblyInfo.cs rename to ext/windows/bridge/WinSdkUnityBridge/Stubs/WinStub/Properties/AssemblyInfo.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/Stubs/WinStub/WinStub.csproj b/ext/windows/bridge/WinSdkUnityBridge/Stubs/WinStub/WinStub.csproj similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/Stubs/WinStub/WinStub.csproj rename to ext/windows/bridge/WinSdkUnityBridge/Stubs/WinStub/WinStub.csproj diff --git a/ext/Windows/bridge/WinSdkUnityBridge/Stubs/WinWsStub/Properties/AssemblyInfo.cs b/ext/windows/bridge/WinSdkUnityBridge/Stubs/WinWsStub/Properties/AssemblyInfo.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/Stubs/WinWsStub/Properties/AssemblyInfo.cs rename to ext/windows/bridge/WinSdkUnityBridge/Stubs/WinWsStub/Properties/AssemblyInfo.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/Stubs/WinWsStub/WinWsStub.csproj b/ext/windows/bridge/WinSdkUnityBridge/Stubs/WinWsStub/WinWsStub.csproj similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/Stubs/WinWsStub/WinWsStub.csproj rename to ext/windows/bridge/WinSdkUnityBridge/Stubs/WinWsStub/WinWsStub.csproj diff --git a/ext/Windows/bridge/WinSdkUnityBridge/TestLibraryInterface/AdjustTestOptionsDto.cs b/ext/windows/bridge/WinSdkUnityBridge/TestLibraryInterface/AdjustTestOptionsDto.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/TestLibraryInterface/AdjustTestOptionsDto.cs rename to ext/windows/bridge/WinSdkUnityBridge/TestLibraryInterface/AdjustTestOptionsDto.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/TestLibraryInterface/IAdjustCommandExecutor.cs b/ext/windows/bridge/WinSdkUnityBridge/TestLibraryInterface/IAdjustCommandExecutor.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/TestLibraryInterface/IAdjustCommandExecutor.cs rename to ext/windows/bridge/WinSdkUnityBridge/TestLibraryInterface/IAdjustCommandExecutor.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/TestLibraryInterface/Properties/AssemblyInfo.cs b/ext/windows/bridge/WinSdkUnityBridge/TestLibraryInterface/Properties/AssemblyInfo.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/TestLibraryInterface/Properties/AssemblyInfo.cs rename to ext/windows/bridge/WinSdkUnityBridge/TestLibraryInterface/Properties/AssemblyInfo.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/TestLibraryInterface/Properties/TestLibraryInterface.rd.xml b/ext/windows/bridge/WinSdkUnityBridge/TestLibraryInterface/Properties/TestLibraryInterface.rd.xml similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/TestLibraryInterface/Properties/TestLibraryInterface.rd.xml rename to ext/windows/bridge/WinSdkUnityBridge/TestLibraryInterface/Properties/TestLibraryInterface.rd.xml diff --git a/ext/Windows/bridge/WinSdkUnityBridge/TestLibraryInterface/TestLibraryInterface.cs b/ext/windows/bridge/WinSdkUnityBridge/TestLibraryInterface/TestLibraryInterface.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/TestLibraryInterface/TestLibraryInterface.cs rename to ext/windows/bridge/WinSdkUnityBridge/TestLibraryInterface/TestLibraryInterface.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/TestLibraryInterface/TestLibraryInterface.csproj b/ext/windows/bridge/WinSdkUnityBridge/TestLibraryInterface/TestLibraryInterface.csproj similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/TestLibraryInterface/TestLibraryInterface.csproj rename to ext/windows/bridge/WinSdkUnityBridge/TestLibraryInterface/TestLibraryInterface.csproj diff --git a/ext/Windows/bridge/WinSdkUnityBridge/TestLibraryInterface/WindowsCommandListener.cs b/ext/windows/bridge/WinSdkUnityBridge/TestLibraryInterface/WindowsCommandListener.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/TestLibraryInterface/WindowsCommandListener.cs rename to ext/windows/bridge/WinSdkUnityBridge/TestLibraryInterface/WindowsCommandListener.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/TestLibraryInterface/project.json b/ext/windows/bridge/WinSdkUnityBridge/TestLibraryInterface/project.json similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/TestLibraryInterface/project.json rename to ext/windows/bridge/WinSdkUnityBridge/TestLibraryInterface/project.json diff --git a/ext/Windows/bridge/WinSdkUnityBridge/TestLibraryStub/AdjustTestOptionsDto.cs b/ext/windows/bridge/WinSdkUnityBridge/TestLibraryStub/AdjustTestOptionsDto.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/TestLibraryStub/AdjustTestOptionsDto.cs rename to ext/windows/bridge/WinSdkUnityBridge/TestLibraryStub/AdjustTestOptionsDto.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/TestLibraryStub/IAdjustCommandExecutor.cs b/ext/windows/bridge/WinSdkUnityBridge/TestLibraryStub/IAdjustCommandExecutor.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/TestLibraryStub/IAdjustCommandExecutor.cs rename to ext/windows/bridge/WinSdkUnityBridge/TestLibraryStub/IAdjustCommandExecutor.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/TestLibraryStub/Properties/AssemblyInfo.cs b/ext/windows/bridge/WinSdkUnityBridge/TestLibraryStub/Properties/AssemblyInfo.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/TestLibraryStub/Properties/AssemblyInfo.cs rename to ext/windows/bridge/WinSdkUnityBridge/TestLibraryStub/Properties/AssemblyInfo.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/TestLibraryStub/TestLibraryInterface.cs b/ext/windows/bridge/WinSdkUnityBridge/TestLibraryStub/TestLibraryInterface.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/TestLibraryStub/TestLibraryInterface.cs rename to ext/windows/bridge/WinSdkUnityBridge/TestLibraryStub/TestLibraryInterface.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/TestLibraryStub/TestLibraryStub.csproj b/ext/windows/bridge/WinSdkUnityBridge/TestLibraryStub/TestLibraryStub.csproj similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/TestLibraryStub/TestLibraryStub.csproj rename to ext/windows/bridge/WinSdkUnityBridge/TestLibraryStub/TestLibraryStub.csproj diff --git a/ext/Windows/bridge/WinSdkUnityBridge/TestLibraryStub/WindowsCommandListener.cs b/ext/windows/bridge/WinSdkUnityBridge/TestLibraryStub/WindowsCommandListener.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/TestLibraryStub/WindowsCommandListener.cs rename to ext/windows/bridge/WinSdkUnityBridge/TestLibraryStub/WindowsCommandListener.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/Win10Interface/Properties/AssemblyInfo.cs b/ext/windows/bridge/WinSdkUnityBridge/Win10Interface/Properties/AssemblyInfo.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/Win10Interface/Properties/AssemblyInfo.cs rename to ext/windows/bridge/WinSdkUnityBridge/Win10Interface/Properties/AssemblyInfo.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/Win10Interface/Properties/Win10Interface.rd.xml b/ext/windows/bridge/WinSdkUnityBridge/Win10Interface/Properties/Win10Interface.rd.xml similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/Win10Interface/Properties/Win10Interface.rd.xml rename to ext/windows/bridge/WinSdkUnityBridge/Win10Interface/Properties/Win10Interface.rd.xml diff --git a/ext/Windows/bridge/WinSdkUnityBridge/Win10Interface/Win10Interface.csproj b/ext/windows/bridge/WinSdkUnityBridge/Win10Interface/Win10Interface.csproj similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/Win10Interface/Win10Interface.csproj rename to ext/windows/bridge/WinSdkUnityBridge/Win10Interface/Win10Interface.csproj diff --git a/ext/Windows/bridge/WinSdkUnityBridge/Win10Interface/project.json b/ext/windows/bridge/WinSdkUnityBridge/Win10Interface/project.json similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/Win10Interface/project.json rename to ext/windows/bridge/WinSdkUnityBridge/Win10Interface/project.json diff --git a/ext/Windows/bridge/WinSdkUnityBridge/Win81Interface/Properties/AssemblyInfo.cs b/ext/windows/bridge/WinSdkUnityBridge/Win81Interface/Properties/AssemblyInfo.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/Win81Interface/Properties/AssemblyInfo.cs rename to ext/windows/bridge/WinSdkUnityBridge/Win81Interface/Properties/AssemblyInfo.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/Win81Interface/Win81Interface.csproj b/ext/windows/bridge/WinSdkUnityBridge/Win81Interface/Win81Interface.csproj similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/Win81Interface/Win81Interface.csproj rename to ext/windows/bridge/WinSdkUnityBridge/Win81Interface/Win81Interface.csproj diff --git a/ext/Windows/bridge/WinSdkUnityBridge/Win81Interface/app.config b/ext/windows/bridge/WinSdkUnityBridge/Win81Interface/app.config similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/Win81Interface/app.config rename to ext/windows/bridge/WinSdkUnityBridge/Win81Interface/app.config diff --git a/ext/Windows/bridge/WinSdkUnityBridge/Win81Interface/packages.config b/ext/windows/bridge/WinSdkUnityBridge/Win81Interface/packages.config similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/Win81Interface/packages.config rename to ext/windows/bridge/WinSdkUnityBridge/Win81Interface/packages.config diff --git a/ext/Windows/bridge/WinSdkUnityBridge/WinInterface/AdjustConfigDto.cs b/ext/windows/bridge/WinSdkUnityBridge/WinInterface/AdjustConfigDto.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/WinInterface/AdjustConfigDto.cs rename to ext/windows/bridge/WinSdkUnityBridge/WinInterface/AdjustConfigDto.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/WinInterface/AdjustWinInterface.cs b/ext/windows/bridge/WinSdkUnityBridge/WinInterface/AdjustWinInterface.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/WinInterface/AdjustWinInterface.cs rename to ext/windows/bridge/WinSdkUnityBridge/WinInterface/AdjustWinInterface.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/WinInterface/Properties/AssemblyInfo.cs b/ext/windows/bridge/WinSdkUnityBridge/WinInterface/Properties/AssemblyInfo.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/WinInterface/Properties/AssemblyInfo.cs rename to ext/windows/bridge/WinSdkUnityBridge/WinInterface/Properties/AssemblyInfo.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/WinInterface/Util.cs b/ext/windows/bridge/WinSdkUnityBridge/WinInterface/Util.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/WinInterface/Util.cs rename to ext/windows/bridge/WinSdkUnityBridge/WinInterface/Util.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/WinInterface/WinInterface.csproj b/ext/windows/bridge/WinSdkUnityBridge/WinInterface/WinInterface.csproj similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/WinInterface/WinInterface.csproj rename to ext/windows/bridge/WinSdkUnityBridge/WinInterface/WinInterface.csproj diff --git a/ext/Windows/bridge/WinSdkUnityBridge/WinInterface/app.config b/ext/windows/bridge/WinSdkUnityBridge/WinInterface/app.config similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/WinInterface/app.config rename to ext/windows/bridge/WinSdkUnityBridge/WinInterface/app.config diff --git a/ext/Windows/bridge/WinSdkUnityBridge/WinInterface/packages.config b/ext/windows/bridge/WinSdkUnityBridge/WinInterface/packages.config similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/WinInterface/packages.config rename to ext/windows/bridge/WinSdkUnityBridge/WinInterface/packages.config diff --git a/ext/Windows/bridge/WinSdkUnityBridge/WinSdkUnityBridge.sln b/ext/windows/bridge/WinSdkUnityBridge/WinSdkUnityBridge.sln similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/WinSdkUnityBridge.sln rename to ext/windows/bridge/WinSdkUnityBridge/WinSdkUnityBridge.sln diff --git a/ext/Windows/bridge/WinSdkUnityBridge/WinWsInterface/Properties/AssemblyInfo.cs b/ext/windows/bridge/WinSdkUnityBridge/WinWsInterface/Properties/AssemblyInfo.cs similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/WinWsInterface/Properties/AssemblyInfo.cs rename to ext/windows/bridge/WinSdkUnityBridge/WinWsInterface/Properties/AssemblyInfo.cs diff --git a/ext/Windows/bridge/WinSdkUnityBridge/WinWsInterface/WinWsInterface.csproj b/ext/windows/bridge/WinSdkUnityBridge/WinWsInterface/WinWsInterface.csproj similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/WinWsInterface/WinWsInterface.csproj rename to ext/windows/bridge/WinSdkUnityBridge/WinWsInterface/WinWsInterface.csproj diff --git a/ext/Windows/bridge/WinSdkUnityBridge/WinWsInterface/packages.config b/ext/windows/bridge/WinSdkUnityBridge/WinWsInterface/packages.config similarity index 100% rename from ext/Windows/bridge/WinSdkUnityBridge/WinWsInterface/packages.config rename to ext/windows/bridge/WinSdkUnityBridge/WinWsInterface/packages.config diff --git a/ext/windows/build-dev.bat b/ext/windows/build-dev.bat new file mode 100644 index 00000000..e1e206f5 --- /dev/null +++ b/ext/windows/build-dev.bat @@ -0,0 +1,77 @@ +@ECHO off + +REM ------------- load submodule +REM ECHO ============== Loading windows SDK submodule ... +REM CALL git submodule update --init --recursive + +IF NOT EXIST sdk-dev\Adjust ( + ECHO Error: Adjust Windows SDK submodule not loaded! + EXIT /B 1 +) + +TITLE Make Unity SDK for Windows... +SET DEVENV_LOCATION=C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE +SET NUGET_LOCATION=C:\nuget + +SET PATH=%PATH%;%DEVENV_LOCATION%;%NUGET_LOCATION% + +ECHO. +ECHO ============== Restoring Adjust SDK Nuget Packages ... +nuget restore "sdk-dev\Adjust\Adjust.sln" + +ECHO. +ECHO ============== Making the Adjust SDK DLLs ... +devenv "sdk-dev\Adjust\Adjust.sln" /build Debug + +ECHO. +ECHO ============== Copying needed Adjust SDK DLLs ... +ECHO f | xcopy /f /y sdk-dev\WindowsPcl\bin\Debug\WindowsPcl.dll bridge\adjust-dlls\WindowsPcl.dll +ECHO f | xcopy /f /y sdk-dev\WindowsUap\bin\Debug\WindowsUap.dll bridge\adjust-dlls\WindowsUap.dll +ECHO f | xcopy /f /y sdk-dev\WindowsUAP10\bin\Debug\AdjustUAP10.dll bridge\adjust-dlls\AdjustUAP10.dll +ECHO f | xcopy /f /y sdk-dev\WindowsStore\bin\Debug\AdjustWS.dll bridge\adjust-dlls\AdjustWS.dll +ECHO f | xcopy /f /y sdk-dev\WindowsPhone81\bin\Debug\AdjustWP81.dll bridge\adjust-dlls\AdjustWP81.dll +REM ---- Integration Testing dll - Test Library +ECHO f | xcopy /f /y sdk-dev\IntegrationTesting\TestLibrary\bin\Debug\TestLibrary.dll bridge\adjust-dlls\TestLibrary.dll + +ECHO. +ECHO ============== Restoring the bridge Nuget Packages ... +nuget restore "bridge\WinSdkUnityBridge\WinSdkUnityBridge.sln" + +ECHO. +ECHO ============== Making the bridge (stubs and interfaces) ... +devenv "bridge\WinSdkUnityBridge\WinSdkUnityBridge.sln" /build Release + +REM ------------------------------------------------------------------------------------------ +REM ------------- At this point, we have stubs and interfaces DLLs in ".\bridge\release" folder +REM ------------- root dir +ECHO f | xcopy /f /y bridge\release\WindowsPcl.dll ..\..\Assets\Adjust\Windows\WindowsPcl.dll +ECHO f | xcopy /f /y bridge\release\WindowsUap.dll ..\..\Assets\Adjust\Windows\WindowsUap.dll + +REM ------------- STUBS +ECHO f | xcopy /f /y bridge\release\stubs\Win10Interface.dll ..\..\Assets\Adjust\Windows\Stubs\Win10Interface.dll +ECHO f | xcopy /f /y bridge\release\stubs\Win81Interface.dll ..\..\Assets\Adjust\Windows\Stubs\Win81Interface.dll +ECHO f | xcopy /f /y bridge\release\stubs\WinWsInterface.dll ..\..\Assets\Adjust\Windows\Stubs\WinWsInterface.dll +ECHO f | xcopy /f /y bridge\release\stubs\TestLibraryInterface.dll ..\..\Assets\Adjust\Windows\Stubs\TestLibraryInterface.dll + +REM ------------- WU10 +ECHO f | xcopy /f /y bridge\release\Win10Interface.dll ..\..\Assets\Adjust\Windows\WU10\Win10Interface.dll +ECHO f | xcopy /f /y bridge\release\AdjustUAP10.dll ..\..\Assets\Adjust\Windows\WU10\AdjustUAP10.dll + +REM ------------- WP 8.1 +ECHO f | xcopy /f /y bridge\release\Win81Interface.dll ..\..\Assets\Adjust\Windows\W81\Win81Interface.dll +ECHO f | xcopy /f /y bridge\release\AdjustWP81.dll ..\..\Assets\Adjust\Windows\W81\AdjustWP81.dll + +REM ------------- WS +ECHO f | xcopy /f /y bridge\release\WinWsInterface.dll ..\..\Assets\Adjust\Windows\WS\WinWsInterface.dll +ECHO f | xcopy /f /y bridge\release\AdjustWS.dll ..\..\Assets\Adjust\Windows\WS\AdjustWS.dll + +REM ------------- Test Library +ECHO f | xcopy /f /y bridge\release\TestLibrary.dll ..\..\Assets\Adjust\Windows\Test\TestLibrary.dll +ECHO f | xcopy /f /y bridge\release\TestLibraryInterface.dll ..\..\Assets\Adjust\Windows\Test\TestLibraryInterface.dll + +REM ------------------------------------------------------------------------------------------ +REM ------------- Remove used unnecessary files +ECHO ============== Removing unnecessary files ... +RMDIR /s /q bridge\adjust-dlls +RMDIR /s /q bridge\release +ECHO ============== All done! diff --git a/ext/Windows/build.bat b/ext/windows/build.bat similarity index 100% rename from ext/Windows/build.bat rename to ext/windows/build.bat diff --git a/ext/Windows/sdk b/ext/windows/sdk similarity index 100% rename from ext/Windows/sdk rename to ext/windows/sdk diff --git a/ext/windows/sdk-dev b/ext/windows/sdk-dev new file mode 160000 index 00000000..32dbf8b5 --- /dev/null +++ b/ext/windows/sdk-dev @@ -0,0 +1 @@ +Subproject commit 32dbf8b5f7325b6e46185b15d534a986c1659ed3