Skip to content

Commit be67353

Browse files
Merge pull request #20 from happyfoxinc/development
Removed jar files and added them as gradle dependencies
2 parents cf22e66 + 9dca0f7 commit be67353

File tree

438 files changed

+62
-6476
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

438 files changed

+62
-6476
lines changed

HelpStackExample/build.gradle

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

33
dependencies {
44
compile fileTree(dir: 'libs', include: '*.jar')
5-
compile project(':appcompat_v7')
65
compile project(':helpstack')
6+
7+
compile ('com.android.support:appcompat-v7:19.1.0') {
8+
force = true
9+
}
710
}
811

912
android {
@@ -33,4 +36,10 @@ android {
3336
debug.setRoot('build-types/debug')
3437
release.setRoot('build-types/release')
3538
}
39+
40+
packagingOptions {
41+
exclude 'META-INF/DEPENDENCIES'
42+
exclude 'META-INF/NOTICE'
43+
exclude 'META-INF/LICENSE'
44+
}
3645
}
-633 KB
Binary file not shown.

HelpStackExample/project.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@
1313
# Project target.
1414
target=android-17
1515
android.library.reference.1=../helpstack
16-
android.library.reference.2=../appcompat_v7
1716
manifestmerger.enabled=true

appcompat_v7/AndroidManifest.xml

Lines changed: 0 additions & 20 deletions
This file was deleted.

appcompat_v7/README.txt

Lines changed: 0 additions & 10 deletions
This file was deleted.

appcompat_v7/build.gradle

Lines changed: 0 additions & 34 deletions
This file was deleted.
-633 KB
Binary file not shown.
Binary file not shown.

appcompat_v7/project.properties

Lines changed: 0 additions & 15 deletions
This file was deleted.

appcompat_v7/res/anim/abc_fade_in.xml

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)