Skip to content

Commit

Permalink
Upgrade stuffs
Browse files Browse the repository at this point in the history
  • Loading branch information
nekocode committed Jan 27, 2019
1 parent f3c90b9 commit 473129f
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 30 deletions.
9 changes: 3 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,15 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath "com.android.tools.build:gradle:3.3.0"
classpath "com.github.dcendents:android-maven-gradle-plugin:1.5"
}
}

allprojects {
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
google()
}
}

Expand Down
3 changes: 0 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
COMPILE_SDK_VERSION=26
BUILD_TOOLS_VERSION=27.0.3
SUPPORT_LIBS_VERSION=27.1.1
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 @@
#Fri May 04 22:47:48 CST 2018
#Sun Jan 27 11:40:57 CST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
16 changes: 7 additions & 9 deletions meepo/build.gradle
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: "com.android.library"
apply plugin: "com.github.dcendents.android-maven"

group='com.github.nekocode'
group="com.github.nekocode"

android {
compileSdkVersion COMPILE_SDK_VERSION.toInteger()
buildToolsVersion BUILD_TOOLS_VERSION

compileSdkVersion 28
defaultConfig {
minSdkVersion 14
targetSdkVersion 26
targetSdkVersion 28
}
lintOptions {
abortOnError false
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
compileOnly "com.android.support:support-annotations:$SUPPORT_LIBS_VERSION"
implementation fileTree(dir: "libs", include: ["*.jar"])
compileOnly "com.android.support:support-annotations:28.0.0"
}
18 changes: 8 additions & 10 deletions sample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
apply plugin: 'com.android.application'
apply plugin: "com.android.application"

android {
compileSdkVersion COMPILE_SDK_VERSION.toInteger()
buildToolsVersion BUILD_TOOLS_VERSION

compileSdkVersion 28
defaultConfig {
applicationId "cn.nekocode.meepo.sample"
minSdkVersion 15
targetSdkVersion 26
targetSdkVersion 28
versionCode 1
versionName "1.0"

Expand All @@ -21,14 +19,14 @@ android {
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
}
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':meepo')
implementation "com.android.support:appcompat-v7:$SUPPORT_LIBS_VERSION"
implementation "com.android.support.constraint:constraint-layout:1.1.0"
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation project(":meepo")
implementation "com.android.support:appcompat-v7:28.0.0"
implementation "com.android.support.constraint:constraint-layout:1.1.3"
}

0 comments on commit 473129f

Please sign in to comment.