Skip to content

Commit 5d6b632

Browse files
Merge pull request #12 from permissions-dispatcher/travis_ci
Add travis setting file
2 parents cd609e5 + cf4de8c commit 5d6b632

File tree

9 files changed

+43
-19
lines changed

9 files changed

+43
-19
lines changed

.travis.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
language: android
2+
3+
android:
4+
components:
5+
- tools
6+
- platform-tools
7+
- build-tools-26.0.1
8+
- android-26
9+
- extra-google-google_play_services
10+
- extra-android-m2repository
11+
- extra-android-support
12+
- extra-google-m2repository
13+
14+
jdk:
15+
- oraclejdk8
16+
17+
branches:
18+
except:
19+
- gh-pages
20+
21+
script: ./gradlew clean check --stacktrace

app/build.gradle

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,21 @@ android {
2525
}
2626

2727
dependencies {
28-
compile fileTree(dir: 'libs', include: ['*.jar'])
29-
30-
//test
31-
androidTestCompile("com.android.support.test.espresso:espresso-core:$espressoCoreVersion", {
32-
exclude group: 'com.android.support', module: 'support-annotations'
33-
})
34-
testCompile "junit:junit:$junitVersion"
35-
36-
//support library
3728
compile "com.android.support:appcompat-v7:$supportLibraryVersion"
3829

39-
compile "com.github.hotchemi:permissionsdispatcher:$permissionsdispatcherVersion"
30+
compile ("com.github.hotchemi:permissionsdispatcher:$permissionsdispatcherVersion") {
31+
exclude module: 'support-compat'
32+
exclude module: 'support-v13'
33+
}
4034
annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:$permissionsdispatcherVersion"
35+
4136
compile "org.androidannotations:androidannotations-api:$androidannotationsVersion"
4237
annotationProcessor "org.androidannotations:androidannotations:$androidannotationsVersion"
38+
4339
annotationProcessor project(':androidannotationspermissionsdispatcherplugin')
44-
}
40+
41+
testCompile "junit:junit:$junitVersion"
42+
androidTestCompile("com.android.support.test.espresso:espresso-core:$espressoCoreVersion", {
43+
exclude group: 'com.android.support', module: 'support-annotations'
44+
})
45+
}

app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
23
package="com.github.aleksandermielczarek.androidannotationspermissionsdispatcherpluginexample">
34

45
<uses-permission android:name="android.permission.CAMERA" />
56
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
67
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
78

89
<application
9-
android:allowBackup="true"
10+
android:allowBackup="false"
1011
android:icon="@mipmap/ic_launcher"
1112
android:label="@string/app_name"
1213
android:supportsRtl="true"
13-
android:theme="@style/AppTheme">
14+
android:theme="@style/AppTheme"
15+
tools:ignore="GoogleAppIndexingWarning">
1416

1517
<activity android:name=".MainActivity_">
1618
<intent-filter>

app/src/main/res/layout/activity_main.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
android:id="@+id/permissionButton"
99
android:layout_width="match_parent"
1010
android:layout_height="wrap_content"
11-
android:text="Ask for permission"/>
11+
android:text="@string/permission_button"/>
1212

1313
<fragment
1414
android:id="@+id/headlines_fragment"

app/src/main/res/layout/fragment_main.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
android:id="@+id/permissionButton"
99
android:layout_width="match_parent"
1010
android:layout_height="wrap_content"
11-
android:text="Ask for permission in fragment"/>
11+
android:text="@string/permission_button"/>
1212

1313
</LinearLayout>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
<resources>
22
<string name="app_name">Android Annotations Permissions Dispatcher Plugin</string>
3+
<string name="permission_button">Ask for permission</string>
34
</resources>

dependencies.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ ext {
33
versionMinor = 0
44
versionFix = 3
55

6-
minSdkVersionVersion = 16
6+
minSdkVersionVersion = 23
77
sdkVersion = 26
88
buildToolsVersionVersion = "26.0.1"
99

1010
toolsBuildGradleVersion = '2.3.3'
1111
gradleVersionsPluginVersion = '0.15.0'
1212
androidMavenGradlePluginVersion = '1.5'
1313

14-
espressoCoreVersion = '3.0.0'
14+
espressoCoreVersion = '3.0.1'
1515
junitVersion = '4.12'
16-
supportLibraryVersion = '26.0.1'
16+
supportLibraryVersion = '26.0.2'
1717
androidannotationsVersion = '4.3.1'
1818
permissionsdispatcherVersion = '2.4.0'
1919
}

gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
#org.gradle.jvmargs=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005
21
org.gradle.jvmargs=-Xmx2048m

gradlew

100644100755
File mode changed.

0 commit comments

Comments
 (0)