diff options
author | Dmitry Jemerov <yole@google.com> | 2014-06-18 12:22:01 +0200 |
---|---|---|
committer | Dmitry Jemerov <yole@google.com> | 2014-06-18 12:22:01 +0200 |
commit | 2f83f8ab6d2018638f22bdc48e9d44a72b759694 (patch) | |
tree | d06097a3f8ccda262fde937d9a73d5eafa29b651 /android/testData/templates | |
parent | 4bc8e273542ecb5fb34a400bce2e587ef1afabc9 (diff) | |
download | idea-2f83f8ab6d2018638f22bdc48e9d44a72b759694.tar.gz |
Don't try merging dependencies which have a closure attached.
There's no way to reliably understand what the closure does, so, in order
to avoid losing users' code, we leave such dependencies untouched.
Change-Id: I23ae83e9c258fcd5cd2d3aabc6114db5cf664de3
Diffstat (limited to 'android/testData/templates')
-rw-r--r-- | android/testData/templates/BaseExclude.gradle | 38 | ||||
-rw-r--r-- | android/testData/templates/MergedCloudDependenciesExclude.gradle | 38 |
2 files changed, 76 insertions, 0 deletions
diff --git a/android/testData/templates/BaseExclude.gradle b/android/testData/templates/BaseExclude.gradle new file mode 100644 index 00000000000..211aa17e852 --- /dev/null +++ b/android/testData/templates/BaseExclude.gradle @@ -0,0 +1,38 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 19 + buildToolsVersion "19.0.1" + + defaultConfig { + minSdkVersion 8 + targetSdkVersion 19 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + runProguard false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } + productFlavors { + basic { + packageName "com.example.projectwithappandlib.app" + } + paid { + packageName "com.example.projectwithappandlib.app.paid" + assets.srcDirs = ['paid-assets'] + manifest.srcFile 'src/paid/AndroidManifest.xml' + } + } +} + +dependencies { + compile 'com.android.support:appcompat-v7:+' + // TODO: Include *.aar once it's supported in the plugin + compile fileTree(dir: 'libs', include: ['*.jar']) + compile('com.google.maps.android:android-maps-utils:0.3.+'){ + exclude group: 'com.google.android.gms' + } +} diff --git a/android/testData/templates/MergedCloudDependenciesExclude.gradle b/android/testData/templates/MergedCloudDependenciesExclude.gradle new file mode 100644 index 00000000000..931d68e6520 --- /dev/null +++ b/android/testData/templates/MergedCloudDependenciesExclude.gradle @@ -0,0 +1,38 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 19 + buildToolsVersion "19.0.1" + + defaultConfig { + minSdkVersion 8 + targetSdkVersion 19 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + runProguard false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } + productFlavors { + basic { + packageName "com.example.projectwithappandlib.app" + } + paid { + packageName "com.example.projectwithappandlib.app.paid" + assets.srcDirs = ['paid-assets'] + manifest.srcFile 'src/paid/AndroidManifest.xml' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + compile('com.google.maps.android:android-maps-utils:0.3.+') { + exclude group: 'com.google.android.gms' + } + compile 'com.android.support:appcompat-v7:+' + compile project(path: '${serverModulePath}', configuration: 'android-endpoints') +} |