Skip to content

Commit

Permalink
Update Gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
mar-v-in committed Aug 27, 2016
1 parent 3532954 commit 4d8fb82
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 12 deletions.
1 change: 0 additions & 1 deletion .gitignore
Expand Up @@ -3,5 +3,4 @@ build/
local.properties
*.iml
.idea/
build.gradle
BuildConfig.java
38 changes: 38 additions & 0 deletions build.gradle
@@ -0,0 +1,38 @@
/*
* Copyright 2013-2016 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
}
}

allprojects {
apply plugin: 'idea'
ext.androidBuildVersionTools = "23.0.3"
}

def androidCompileSdk() { return 23 }

subprojects {
repositories {
jcenter()
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
12 changes: 2 additions & 10 deletions microg-ui-tools/build.gradle
Expand Up @@ -14,14 +14,6 @@
* limitations under the License.
*/

buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
}
}
apply plugin: 'com.android.library'

String getMyVersionName() {
Expand All @@ -34,8 +26,8 @@ String getMyVersionName() {
}

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion androidCompileSdk()
buildToolsVersion "$androidBuildVersionTools"

defaultConfig {
versionName getMyVersionName()
Expand Down

0 comments on commit 4d8fb82

Please sign in to comment.