Skip to content

Commit ff42443

Browse files
committed
try to solve manifest merger issue #405
1 parent 92e780b commit ff42443

6 files changed

Lines changed: 31 additions & 27 deletions

File tree

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ For more information, see the [GitHub Wiki](https://github.com/ArthurHub/Android
121121
- [Adding auto-zoom feature to Android-Image-Cropper](https://theartofdev.com/2016/04/25/adding-auto-zoom-feature-to-android-image-cropper/)
122122

123123
## Change log
124+
*2.5.1* (in-dev)
125+
- Try solve manifest merger issue by adding `transitive` flag #405 (thx @j-garin)
126+
124127
*2.5.0*
125128
- Update to sdk v26
126129
- Update gradle plugin to 2.0

build.gradle

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,25 @@ buildscript {
44
}
55
dependencies {
66
classpath 'com.android.tools.build:gradle:2.3.3'
7-
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
87
}
98
}
109

1110
allprojects {
1211
repositories {
1312
jcenter()
14-
mavenLocal()
15-
mavenCentral()
1613
maven {
1714
url "https://maven.google.com"
1815
}
1916
}
20-
}
17+
}
18+
19+
ext {
20+
compileSdkVersion = 26
21+
buildToolsVersion = '26.0.2'
22+
supportLibraryVersion = '26.+'
23+
24+
PUBLISH_GROUP_ID = 'com.theartofdev.edmodo'
25+
PUBLISH_ARTIFACT_ID = 'android-image-cropper'
26+
PUBLISH_VERSION = '2.5.1'
27+
// gradlew clean build generateRelease
28+
}

cropper/build.gradle

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,10 @@ apply plugin: 'com.android.library'
33
// http://www.flexlabs.org/2013/06/using-local-aar-android-library-packages-in-gradle-builds
44
apply plugin: 'maven-publish'
55

6-
group = 'com.github.ArthurHub'
7-
8-
ext {
9-
PUBLISH_GROUP_ID = 'com.theartofdev.edmodo'
10-
PUBLISH_ARTIFACT_ID = 'android-image-cropper'
11-
PUBLISH_VERSION = '2.5.0'
12-
// gradlew clean build generateRelease
13-
}
14-
156
android {
167

17-
compileSdkVersion 26
18-
buildToolsVersion '26.0.1'
8+
compileSdkVersion rootProject.compileSdkVersion
9+
buildToolsVersion rootProject.buildToolsVersion
1910
defaultConfig {
2011
minSdkVersion 14
2112
targetSdkVersion 26
@@ -51,7 +42,9 @@ publishing {
5142
apply from: 'https://raw.githubusercontent.com/ArthurHub/release-android-library/master/android-release-aar.gradle'
5243

5344
dependencies {
54-
compile 'com.android.support:appcompat-v7:26.0.2'
55-
compile "com.android.support:exifinterface:26.0.2"
45+
compile "com.android.support:appcompat-v7:$supportLibraryVersion"
46+
compile("com.android.support:exifinterface:$supportLibraryVersion") {
47+
transitive = false
48+
}
5649
}
5750

quick-start/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 26
5-
buildToolsVersion '26.0.1'
4+
compileSdkVersion rootProject.compileSdkVersion
5+
buildToolsVersion rootProject.buildToolsVersion
66

77
defaultConfig {
88
minSdkVersion 14
@@ -17,5 +17,5 @@ android {
1717

1818
dependencies {
1919
compile project(':cropper')
20-
compile 'com.android.support:appcompat-v7:26.0.2'
20+
compile "com.android.support:appcompat-v7:$supportLibraryVersion"
2121
}

sample/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 26
5-
buildToolsVersion '26.0.1'
4+
compileSdkVersion rootProject.compileSdkVersion
5+
buildToolsVersion rootProject.buildToolsVersion
66

77
defaultConfig {
88
minSdkVersion 14
@@ -17,5 +17,5 @@ android {
1717

1818
dependencies {
1919
compile project(':cropper')
20-
compile 'com.android.support:appcompat-v7:26.0.2'
20+
compile "com.android.support:appcompat-v7:$supportLibraryVersion"
2121
}

test/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 26
5-
buildToolsVersion '26.0.1'
4+
compileSdkVersion rootProject.compileSdkVersion
5+
buildToolsVersion rootProject.buildToolsVersion
66

77
defaultConfig {
88
minSdkVersion 14
@@ -16,7 +16,7 @@ android {
1616
}
1717

1818
dependencies {
19-
compile 'com.android.support:appcompat-v7:26.0.2'
20-
compile 'com.theartofdev.edmodo:android-image-cropper:2.4.+'
19+
compile "com.android.support:appcompat-v7:6.0.2"
20+
compile 'com.theartofdev.edmodo:android-image-cropper:2.5.+'
2121

2222
}

0 commit comments

Comments
 (0)