new gradle distro (8683e9d6) · Commits · Innovation / mse-server-android

app/app.iml

+4 −1

app/build.gradle

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,6 @@ android {

	buildTypes {		buildTypes {
	release {		release {
	runProguard false
	proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'		proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
	}		}
	}		}

build.gradle

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4,7 +4,7 @@ buildscript {
	jcenter()		jcenter()
	}		}
	dependencies {		dependencies {
	classpath 'com.android.tools.build:gradle:0.12.+'		classpath 'com.android.tools.build:gradle:1.0.0'
	}		}
	}		}

gradle/wrapper/gradle-wrapper.properties

+2 −2

Original line number	Original line	Diff line number	Diff line
	#Wed Apr 10 15:27:10 PDT 2013		#Wed Dec 10 17:56:52 MST 2014
	distributionBase=GRADLE_USER_HOME		distributionBase=GRADLE_USER_HOME
	distributionPath=wrapper/dists		distributionPath=wrapper/dists
	zipStoreBase=GRADLE_USER_HOME		zipStoreBase=GRADLE_USER_HOME
	zipStorePath=wrapper/dists		zipStorePath=wrapper/dists
	distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip		distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

mse-server-android.iml

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7,7 +7,9 @@
	</configuration>		</configuration>
	</facet>		</facet>
	</component>		</component>
	<component name="NewModuleRootManager" inherit-compiler-output="true">		<component name="NewModuleRootManager" inherit-compiler-output="false">
			<output url="file://$MODULE_DIR$/build/classes/main" />
			<output-test url="file://$MODULE_DIR$/build/classes/test" />
	<exclude-output />		<exclude-output />
	<content url="file://$MODULE_DIR$">		<content url="file://$MODULE_DIR$">
	<excludeFolder url="file://$MODULE_DIR$/.gradle" />		<excludeFolder url="file://$MODULE_DIR$/.gradle" />

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,7 @@
	<configuration>		<configuration>
	<option name="SELECTED_BUILD_VARIANT" value="debug" />		<option name="SELECTED_BUILD_VARIANT" value="debug" />
	<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />		<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
	<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />		<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
	<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />		<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
	<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />		<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
	<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />		<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
	@@ -31,11 +31,13 @@
	<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />		<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
	<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />		<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
	<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />		<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
			<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
	<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />		<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
	<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />		<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
	<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />		<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
	<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />		<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
	<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />		<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
			<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
	<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />		<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
	<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />		<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
	<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />		<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
	@@ -77,6 +79,7 @@
	<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />		<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
	<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />		<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
	<excludeFolder url="file://$MODULE_DIR$/build/outputs" />		<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
			<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
	</content>		</content>
	<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />		<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
	<orderEntry type="sourceFolder" forTests="false" />		<orderEntry type="sourceFolder" forTests="false" />