Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update gradle #76

Merged
merged 7 commits into from Dec 4, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions .travis.yml
Expand Up @@ -5,12 +5,16 @@ before_script:

android:
components:
- build-tools-23.0.1
- android-23
- tools
- platform-tools
- tools # This duplication is intented to make travis accept license, please check https://github.com/travis-ci/docs-travis-ci-com/issues/779
- build-tools-25.0.1
- android-25
- extra-android-m2repository
licenses:
- android-sdk-license-.*
- 'android-sdk-preview-license-52d11cd2'
- 'android-sdk-license-.+'
- 'google-gdk-license-.+'

jdk:
- oraclejdk8
Expand Down
11 changes: 11 additions & 0 deletions README.md
Expand Up @@ -155,6 +155,17 @@ See for example [LightCycleActionBarActivity](lightcycle-lib/src/main/java/com/s

Gradle:

```gradle
ext.lightCycleVersion=<LATEST_VERSION>

dependencies {
compile "com.soundcloud.lightcycle:lightcycle-lib:$lightCycleVersion"
annotationProcessor "com.soundcloud.lightcycle:lightcycle-processor:$lightCycleVersion"
}
```

Or if you're using a version of the Android gradle plugin below `2.2.0`

```gradle
buildscript {
dependencies {
Expand Down
13 changes: 6 additions & 7 deletions build.gradle
@@ -1,7 +1,6 @@
buildscript {
repositories {
mavenLocal()
mavenCentral()
jcenter()
}
dependencies {
Expand All @@ -18,20 +17,20 @@ task wrapper(type: Wrapper) {
allprojects {
repositories {
mavenLocal()
mavenCentral()
jcenter()
}
}

ext {
minSdkVersion = 8
targetSdkVersion = 23
compileSdkVersion = 23
buildToolsVersion = '23.0.1'
minSdkVersion = 9
targetSdkVersion = 25
compileSdkVersion = 25
buildToolsVersion = '25.0.1'
sourceCompatibilityVersion = JavaVersion.VERSION_1_7
targetCompatibilityVersion = JavaVersion.VERSION_1_7
}

def supportLibVersion = '23.1.1'
def supportLibVersion = '25.0.1'

ext.deps = [
// Android
Expand Down
9 changes: 3 additions & 6 deletions examples/basic/build.gradle
@@ -1,17 +1,14 @@
buildscript {
repositories {
mavenCentral()
jcenter()
}
dependencies {
// replace with the current version of the Android plugin
classpath 'com.android.tools.build:gradle:1.5.0'
// the latest version of the android-apt plugin
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'com.android.tools.build:gradle:2.2.0'
}
}

apply plugin: 'com.android.application'
apply plugin: 'android-apt'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
Expand All @@ -32,7 +29,7 @@ android {
}

dependencies {
apt project(":lightcycle-processor")
annotationProcessor project(":lightcycle-processor")

compile project(":lightcycle-lib")
compile deps.appcompat_v7
Expand Down
11 changes: 4 additions & 7 deletions examples/real-world/build.gradle
@@ -1,17 +1,14 @@
buildscript {
repositories {
mavenCentral()
jcenter()
}
dependencies {
// replace with the current version of the Android plugin
classpath 'com.android.tools.build:gradle:1.5.0'
// the latest version of the android-apt plugin
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'com.android.tools.build:gradle:2.2.2'
}
}

apply plugin: 'com.android.application'
apply plugin: 'android-apt'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
Expand All @@ -31,10 +28,10 @@ android {
}

dependencies {
apt project(":lightcycle-processor")
annotationProcessor project(":lightcycle-processor")
compile project(":lightcycle-lib")

apt "com.squareup.dagger:dagger-compiler:1.2.2"
annotationProcessor "com.squareup.dagger:dagger-compiler:1.2.2"
compile "com.squareup.dagger:dagger:1.2.2"

compile deps.appcompat_v7
Expand Down
12 changes: 1 addition & 11 deletions lightcycle-integration-test/build.gradle
@@ -1,14 +1,4 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
}
}

apply plugin: 'com.android.application'
apply plugin: 'android-apt'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
Expand All @@ -29,7 +19,7 @@ android {
}

dependencies {
apt project(":lightcycle-processor")
annotationProcessor project(":lightcycle-processor")

compile project(":lightcycle-lib")
compile deps.appcompat_v7
Expand Down