Skip to content
This repository has been archived by the owner on Sep 19, 2023. It is now read-only.

Commit

Permalink
Fix Travis CI and build
Browse files Browse the repository at this point in the history
  • Loading branch information
mar-v-in committed Nov 16, 2016
1 parent 0204d39 commit 3f047dc
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 6 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@ before_install:
before_script:
- echo sdk.dir $ANDROID_HOME > local.properties
script:
- jdk_switcher use oraclejdk8
- export TERM=dumb
- export JAVA_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
- ./gradlew build
android:
components:
- platform-tools
- tools
- build-tools-23.0.2
- android-23
- platform-tools
- build-tools-24.0.3
- android-24
- extra-android-m2repository
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
Expand Down
65 changes: 65 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/*
* 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.2.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
}
}

allprojects {
apply plugin: 'idea'
ext.androidBuildVersionTools = "24.0.3"
ext.isReleaseVersion = false
}

def androidCompileSdk() { return 24 }

def androidTargetSdk() { return 24 }

def androidMinSdk() { return 9 }

def versionCode() {
def stdout = new ByteArrayOutputStream()
exec { commandLine 'git', 'rev-list', '--count', "HEAD"; standardOutput = stdout }
return Integer.parseInt(stdout.toString().trim())
}

def versionName() {
def stdout = new ByteArrayOutputStream()
if (rootProject.file("gradlew").exists())
exec { commandLine 'git', 'describe', '--tags', '--always', '--dirty'; standardOutput = stdout }
else // automatic build system, don't tag dirty
exec { commandLine 'git', 'describe', '--tags', '--always'; standardOutput = stdout }
return stdout.toString().trim().substring(1)
}

subprojects {
group = 'org.microg'
repositories {
jcenter()
}

tasks.withType(JavaCompile) {
sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_7
}
}

6 changes: 4 additions & 2 deletions fake-store/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@ int getMyVersionCode() {
}

android {
compileSdkVersion 24
buildToolsVersion "24.0.3"
compileSdkVersion androidCompileSdk()
buildToolsVersion "$androidBuildVersionTools"

defaultConfig {
versionName getMyVersionName()
versionCode getMyVersionCode()
minSdkVersion androidMinSdk()
targetSdkVersion androidTargetSdk()
}

compileOptions {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
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.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

0 comments on commit 3f047dc

Please sign in to comment.