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 build #5

Merged
merged 10 commits into from Dec 29, 2017
@@ -1,11 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {

repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.android.tools.build:gradle:3.0.1'


// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -14,6 +17,7 @@ buildscript {

allprojects {
repositories {
google()
jcenter()
}
}
@@ -0,0 +1,17 @@
machine:
java:
version: oraclejdk8
environment:
ANDROID_SDK: $HOME/.android
ANDROID_HOME: $HOME/.android

# Simulate Android license acceptance by copying SHA from local
# development machine at $ANDROID_SDK/licenses/android-sdk-license
# (Mac: ~/Library/Android/sdk/licenses/android-sdk-license)
# into CI's Android SDK directory. The SHA may require updating
# upon moving to a new SDK version.
# See https://stackoverflow.com/a/38381577/6277151
dependencies:
pre:
- mkdir -p "$ANDROID_SDK/licenses"
- echo -e "\nd56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_SDK/licenses/android-sdk-license"
@@ -9,10 +9,9 @@

# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx1536m

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# org.gradle.parallel=true
Binary file not shown.
@@ -1,6 +1,6 @@
#Mon Oct 03 09:02:51 CDT 2016
#Tue Dec 19 04:31:31 CST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip
@@ -1,12 +1,16 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 24
buildToolsVersion "23.0.3"
compileSdkVersion 26

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

defaultConfig {
minSdkVersion 15
targetSdkVersion 24
targetSdkVersion 26
versionCode 1
versionName "1.0"
}
@@ -22,8 +26,8 @@ android {
}

dependencies {
testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:1.9.5'
compile 'com.squareup.retrofit2:retrofit:2.1.0'
compile 'com.squareup.retrofit2:converter-gson:2.1.0'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:1.9.5'
implementation 'com.squareup.retrofit2:retrofit:2.1.0'
implementation 'com.squareup.retrofit2:converter-gson:2.1.0'
}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.