Skip to content

Commit

Permalink
Move the native libs to their conventional directory
Browse files Browse the repository at this point in the history
  • Loading branch information
Jawnnypoo committed Aug 15, 2016
1 parent 2219506 commit 5372581
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 44 deletions.
18 changes: 6 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
language: android

jdk:
- oraclejdk8

android:
components:
# Uncomment the lines below if you want to
# use the latest revision of Android SDK Tools
- platform-tools
- tools

# The BuildTools version used by your project
- build-tools-23.0.1

# The SDK version used to compile your project
- android-23

# Additional components
# - extra-google-google_play_services
# - extra-google-m2repository
- build-tools-24.0.1
- android-24
- extra-android-m2repository

before_script:
Expand Down
17 changes: 14 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,22 @@ As you may see, kikoso has not yet provided a way to add StackBlur as a gradle d
[![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)

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

```Gradle
Add this in your root `build.gradle` file (**not** your module `build.gradle` file):

```gradle
allprojects {
repositories {
...
maven { url "https://jitpack.io" }
}
}
```

Then, add the library to your project `build.gradle`
```gradle
dependencies {
compile 'com.commit451:NativeStackBlur:1.0.2'
compile 'com.github.Commit451:NativeStackBlur:1.0.3'
}
```

Expand Down
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
compileSdkVersion 24
buildToolsVersion "24.0.1"

defaultConfig {
applicationId "com.commit451.nativestackblur.sample"
minSdkVersion 8
targetSdkVersion 23
targetSdkVersion 24
versionCode 1
versionName "1.0"
}
Expand All @@ -21,7 +21,7 @@ android {

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:appcompat-v7:24.1.1'
compile 'com.squareup.picasso:picasso:2.5.2'
compile project(':nativestackblur')
}
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.3.0'
classpath 'com.novoda:bintray-release:0.3.4'
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Sep 10 10:50:01 CDT 2015
#Mon Aug 15 08:53:35 CDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
28 changes: 7 additions & 21 deletions nativestackblur/build.gradle
Original file line number Diff line number Diff line change
@@ -1,37 +1,23 @@
apply plugin: 'com.android.library'
apply plugin: 'com.novoda.bintray-release'

android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
compileSdkVersion 24
buildToolsVersion "24.0.1"

defaultConfig {
minSdkVersion 8
targetSdkVersion 23
versionCode 102
versionName "1.0.2"
targetSdkVersion 24
versionCode 100
versionName "1.0"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
sourceSets {
main {
jniLibs.srcDirs = ['libs']
}
}
}

publish {
userOrg = 'commit451'
groupId = 'com.commit451'
artifactId = 'NativeStackBlur'
version = '1.0.2'
description = 'Android StackBlur with gradle support (only for the native method) https://github.com/kikoso/android-stackblur'
website = 'https://github.com/Commit451/NativeStackBlur'
issueTracker = "https://github.com/Commit451/NativeStackBlur/issues"
repository = "https://github.com/Commit451/NativeStackBlur.git"
}
apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle'


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

0 comments on commit 5372581

Please sign in to comment.