diff --git a/unity/ChangeLog.txt b/unity/ChangeLog.txt index c321c7ff4..cc1a954ab 100644 --- a/unity/ChangeLog.txt +++ b/unity/ChangeLog.txt @@ -1,9 +1,14 @@ Google Mobile Ads Unity Plugin Change Log +************* +Version 2.3.1 +************* +- Move IInAppBillingService into its own JAR + ************* Version 2.3.0 ************* -- Add support for In-App Purchase house ads on Android. +- Add support for In-App Purchase house ads on Android ************* Version 2.2.1 diff --git a/unity/source/Assets/GoogleMobileAds/Api/AdRequest.cs b/unity/source/Assets/GoogleMobileAds/Api/AdRequest.cs index d870c2f3c..77c2b9926 100644 --- a/unity/source/Assets/GoogleMobileAds/Api/AdRequest.cs +++ b/unity/source/Assets/GoogleMobileAds/Api/AdRequest.cs @@ -6,7 +6,7 @@ namespace GoogleMobileAds.Api { public class AdRequest { - public const string Version = "2.3.0"; + public const string Version = "2.3.1"; public const string TestDeviceSimulator = "SIMULATOR"; public class Builder diff --git a/unity/source/plugin-library/billingaidl/.gitignore b/unity/source/plugin-library/billingaidl/.gitignore new file mode 100644 index 000000000..796b96d1c --- /dev/null +++ b/unity/source/plugin-library/billingaidl/.gitignore @@ -0,0 +1 @@ +/build diff --git a/unity/source/plugin-library/billingaidl/build.gradle b/unity/source/plugin-library/billingaidl/build.gradle new file mode 100644 index 000000000..8a07863ff --- /dev/null +++ b/unity/source/plugin-library/billingaidl/build.gradle @@ -0,0 +1,37 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion 22 + buildToolsVersion "22.0.1" + + defaultConfig { + minSdkVersion 9 + targetSdkVersion 22 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + compile 'com.android.support:appcompat-v7:22.1.1' +} + +task clearJar(type: Delete) { + delete 'build/libs/billingaidl.jar' +} + +task makeJar(type: Copy) { + from('build/intermediates/bundles/release/') + into('build/libs/') + include('classes.jar') + rename ('classes.jar', 'in-app-billing-service-aidl.jar') +} + +makeJar.dependsOn(clearJar, build) diff --git a/unity/source/plugin-library/billingaidl/proguard-rules.pro b/unity/source/plugin-library/billingaidl/proguard-rules.pro new file mode 100644 index 000000000..0d28cb60a --- /dev/null +++ b/unity/source/plugin-library/billingaidl/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /usr/local/google/home/pavlotsky/Android/Sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/unity/source/plugin-library/billingaidl/src/main/AndroidManifest.xml b/unity/source/plugin-library/billingaidl/src/main/AndroidManifest.xml new file mode 100644 index 000000000..4ae358d37 --- /dev/null +++ b/unity/source/plugin-library/billingaidl/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/unity/source/plugin-library/app/src/main/aidl/com/android/vending/billing/IInAppBillingService.aidl b/unity/source/plugin-library/billingaidl/src/main/aidl/com/android/vending/billing/IInAppBillingService.aidl similarity index 100% rename from unity/source/plugin-library/app/src/main/aidl/com/android/vending/billing/IInAppBillingService.aidl rename to unity/source/plugin-library/billingaidl/src/main/aidl/com/android/vending/billing/IInAppBillingService.aidl diff --git a/unity/source/plugin-library/settings.gradle b/unity/source/plugin-library/settings.gradle index e7b4def49..d51198ec2 100644 --- a/unity/source/plugin-library/settings.gradle +++ b/unity/source/plugin-library/settings.gradle @@ -1 +1 @@ -include ':app' +include ':app', ':billingaidl'