Skip to content

Commit 5372581

Browse files
committed
Move the native libs to their conventional directory
1 parent 2219506 commit 5372581

File tree

13 files changed

+35
-44
lines changed

13 files changed

+35
-44
lines changed

.travis.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
language: android
2+
3+
jdk:
4+
- oraclejdk8
5+
26
android:
37
components:
4-
# Uncomment the lines below if you want to
5-
# use the latest revision of Android SDK Tools
68
- platform-tools
79
- tools
8-
9-
# The BuildTools version used by your project
10-
- build-tools-23.0.1
11-
12-
# The SDK version used to compile your project
13-
- android-23
14-
15-
# Additional components
16-
# - extra-google-google_play_services
17-
# - extra-google-m2repository
10+
- build-tools-24.0.1
11+
- android-24
1812
- extra-android-m2repository
1913

2014
before_script:

README.md

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,22 @@ As you may see, kikoso has not yet provided a way to add StackBlur as a gradle d
66
[![Build Status](https://travis-ci.org/Commit451/NativeStackBlur.svg?branch=master)](https://travis-ci.org/Commit451/NativeStackBlur) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-NativeStackBlur-green.svg?style=flat)](https://android-arsenal.com/details/1/2495)
77

88
# Gradle Dependency
9-
Easily reference the library in your Android projects using this dependency in your module's `build.gradle` file:
109

11-
```Gradle
10+
Add this in your root `build.gradle` file (**not** your module `build.gradle` file):
11+
12+
```gradle
13+
allprojects {
14+
repositories {
15+
...
16+
maven { url "https://jitpack.io" }
17+
}
18+
}
19+
```
20+
21+
Then, add the library to your project `build.gradle`
22+
```gradle
1223
dependencies {
13-
compile 'com.commit451:NativeStackBlur:1.0.2'
24+
compile 'com.github.Commit451:NativeStackBlur:1.0.3'
1425
}
1526
```
1627

app/build.gradle

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

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.1"
4+
compileSdkVersion 24
5+
buildToolsVersion "24.0.1"
66

77
defaultConfig {
88
applicationId "com.commit451.nativestackblur.sample"
99
minSdkVersion 8
10-
targetSdkVersion 23
10+
targetSdkVersion 24
1111
versionCode 1
1212
versionName "1.0"
1313
}
@@ -21,7 +21,7 @@ android {
2121

2222
dependencies {
2323
compile fileTree(include: ['*.jar'], dir: 'libs')
24-
compile 'com.android.support:appcompat-v7:23.0.1'
24+
compile 'com.android.support:appcompat-v7:24.1.1'
2525
compile 'com.squareup.picasso:picasso:2.5.2'
2626
compile project(':nativestackblur')
2727
}

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.3.0'
9-
classpath 'com.novoda:bintray-release:0.3.4'
8+
classpath 'com.android.tools.build:gradle:2.1.2'
9+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
1010

1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Sep 10 10:50:01 CDT 2015
1+
#Mon Aug 15 08:53:35 CDT 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

nativestackblur/build.gradle

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,23 @@
11
apply plugin: 'com.android.library'
2-
apply plugin: 'com.novoda.bintray-release'
32

43
android {
5-
compileSdkVersion 23
6-
buildToolsVersion "23.0.1"
4+
compileSdkVersion 24
5+
buildToolsVersion "24.0.1"
76

87
defaultConfig {
98
minSdkVersion 8
10-
targetSdkVersion 23
11-
versionCode 102
12-
versionName "1.0.2"
9+
targetSdkVersion 24
10+
versionCode 100
11+
versionName "1.0"
1312
}
1413
buildTypes {
1514
release {
1615
minifyEnabled false
1716
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1817
}
1918
}
20-
sourceSets {
21-
main {
22-
jniLibs.srcDirs = ['libs']
23-
}
24-
}
2519
}
2620

27-
publish {
28-
userOrg = 'commit451'
29-
groupId = 'com.commit451'
30-
artifactId = 'NativeStackBlur'
31-
version = '1.0.2'
32-
description = 'Android StackBlur with gradle support (only for the native method) https://github.com/kikoso/android-stackblur'
33-
website = 'https://github.com/Commit451/NativeStackBlur'
34-
issueTracker = "https://github.com/Commit451/NativeStackBlur/issues"
35-
repository = "https://github.com/Commit451/NativeStackBlur.git"
36-
}
21+
apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle'
22+
3723

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)