Skip to content

Commit 0dd3650

Browse files
committed
Merge branch 'Android-O' of github.com:aerogear/aerogear-android-core
2 parents f5fbaae + a7fed0d commit 0dd3650

6 files changed

Lines changed: 13 additions & 13 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Add to your application's `build.gradle` file
2828

2929
```groovy
3030
dependencies {
31-
compile 'org.jboss.aerogear:aerogear-android-core:3.1.0'
31+
compile 'org.jboss.aerogear:aerogear-android-core:4.0.0'
3232
}
3333
```
3434

@@ -40,7 +40,7 @@ Include the following dependencies in your project's `pom.xml`
4040
<dependency>
4141
<groupId>org.jboss.aerogear</groupId>
4242
<artifactId>aerogear-android-core</artifactId>
43-
<version>3.1.0</version>
43+
<version>4.0.0</version>
4444
<type>aar</type>
4545
</dependency>
4646
```

build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
buildscript {
22
repositories {
3+
google()
34
jcenter()
45
}
56
dependencies {
6-
classpath 'com.android.tools.build:gradle:2.3.2'
7-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
7+
classpath 'com.android.tools.build:gradle:3.0.0'
8+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
89
}
910
}
1011

circle.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ machine:
22
java:
33
version: oraclejdk8
44
environment:
5-
ANDROID_SDK: "android-25"
6-
BUILD_TOOLS: "25.0.3"
5+
ANDROID_SDK: "android-26"
6+
BUILD_TOOLS: "26.0.2"
77

88
dependencies:
99
pre:

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Android Stuff
22

3-
VERSION_CODE=310
4-
VERSION_NAME=3.1.0
3+
VERSION_CODE=400
4+
VERSION_NAME=4.0.0
55

66
# Bintray Stuff
77

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Mon Jun 26 17:02:23 BRT 2017
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

library/build.gradle

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

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "25.0.3"
4+
compileSdkVersion 26
5+
buildToolsVersion "26.0.2"
66

77
defaultConfig {
88
minSdkVersion 16
9-
targetSdkVersion 25
9+
targetSdkVersion 26
1010

1111
versionCode Integer.parseInt(project.property("VERSION_CODE"))
1212
versionName project.property("VERSION_NAME")

0 commit comments

Comments
 (0)