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.

Sign up for GitHub

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

fix .travis.yml #230

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

fix .travis.yml #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
601c4b1
fix .travis.yml
Nov 13, 2018
d669c44
fix .travis.yml
Nov 13, 2018
de99198
fix gradlew.bat
Nov 13, 2018
af5c32d
change jdk 7 to 8
Nov 14, 2018
6a5d3e4
remove component item
Nov 14, 2018
8b066a6
Merge branch 'master' into feature/fix_travis_yml
yt8492 Dec 19, 2018
994456c
update buildToolsVersion
yt8492 Dec 19, 2018
22078f3
Merge remote-tracking branch 'origin/feature/fix_travis_yml' into fea…
yt8492 Dec 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: android

jdk: oraclejdk7
jdk:
- oraclejdk8

android:
components:
Expand Down
4 changes: 3 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
buildscript {
repositories {
mavenCentral()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.android.tools.build:gradle:3.2.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -18,6 +19,7 @@ allprojects {

repositories {
mavenCentral()
google()
maven {
url "https://oss.sonatype.org/content/repositories/snapshots/"
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Nov 27 14:28:16 IST 2016
#Wed Dec 19 17:42:19 JST 2018
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.6-all.zip
4 changes: 2 additions & 2 deletions saripaar-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
buildToolsVersion '28.0.3'

defaultConfig {
applicationId "com.mobsandgeeks.saripaar.tests"
minSdkVersion 14
targetSdkVersion 25
targetSdkVersion 26
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand Down
4 changes: 2 additions & 2 deletions saripaar/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ apply from: '../config/quality.gradle'

android {
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
buildToolsVersion '28.0.3'

lintOptions {
abortOnError false
}
defaultConfig {
minSdkVersion 8
targetSdkVersion 25
targetSdkVersion 26
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
Expand Down