Update gradle, build tools (1c1782ff) · Commits · e / os / MicroGUITools

.travis.yml

+7 −3

Original line number	Diff line number	Diff line
		@@ -5,15 +5,19 @@ before_script:
		script:
		- jdk_switcher use oraclejdk8
		- export TERM=dumb
		- export JAVA_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
		- export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
		- ./gradlew build
		android:
		components:
		- tools
		- platform-tools
		- build-tools-25.0.2
		- android-25
		- build-tools-27.0.3
		- android-27
		- extra-android-m2repository
		licenses:
		- '.+'
		before_install:
		- yes \| sdkmanager "platforms;android-27"
		before_cache:
		- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
		cache:

+4 −3

Original line number	Diff line number	Diff line
		@@ -17,19 +17,20 @@
		buildscript {
		repositories {
		jcenter()
		google()
		}
		dependencies {
		classpath 'com.android.tools.build:gradle:2.3.1'
		classpath 'com.android.tools.build:gradle:3.0.1'
		classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
		}
		}

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

		def androidCompileSdk() { return 25 }
		def androidCompileSdk() { return 27 }

		def androidTargetSdk() { return 23 }

+1 −1

Original line number	Diff line number	Diff line
		@@ -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-3.3-all.zip
		distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip

+6 −4

Original line number	Diff line number	Diff line
		@@ -36,8 +36,10 @@ android {
		}

		compileOptions {
		sourceCompatibility JavaVersion.VERSION_1_6
		sourceCompatibility JavaVersion.VERSION_1_8
		targetCompatibility JavaVersion.VERSION_1_8
		}

		lintOptions {
		// TODO: Remove MissingTranslation once we have stable strings and proper translations.
		disable 'MissingTranslation'
		@@ -45,8 +47,8 @@ android {
		}

		dependencies {
		compile 'com.android.support:support-v4:25.3.1'
		compile 'com.android.support:appcompat-v7:25.3.1'
		compile 'com.takisoft.fix:preference-v7:25.3.1.0'
		api 'com.android.support:support-v4:25.3.1'
		api 'com.android.support:appcompat-v7:25.3.1'
		api 'com.takisoft.fix:preference-v7:25.3.1.0'
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@
		android:viewportWidth="24">

		<path
		android:fillColor="@android:color/white"
		android:fillColor="#ffffff"
		android:pathData="M12.0,8.0l-6.0,6.0 1.41,1.41L12.0,10.83l4.59,4.58L18.0,14.0z"/>

		</vector>