Skip to content

Commit 861bec7

Browse files
XenGiXenGi
committed
gradle did some stuff
1 parent cfae1ff commit 861bec7

File tree

5 files changed

+48
-39
lines changed

5 files changed

+48
-39
lines changed

‎PyMLGame-Controller.iml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id="PyMLGame-Controller" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>
66
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
7+
<option name="BUILDABLE" value="false" />
78
</configuration>
89
</facet>
910
</component>
10-
<component name="NewModuleRootManager" inherit-compiler-output="false">
11-
<output url="file://$MODULE_DIR$/build/classes/main" />
12-
<output-test url="file://$MODULE_DIR$/build/classes/test" />
11+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
1312
<exclude-output />
1413
<content url="file://$MODULE_DIR$">
1514
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1615
</content>
17-
<orderEntry type="inheritedJdk" />
16+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1817
<orderEntry type="sourceFolder" forTests="false" />
1918
</component>
20-
</module>
21-
19+
</module>

‎app/app.iml‎

Lines changed: 39 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -11,9 +11,9 @@
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
1212
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1313
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
14-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
15-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16-
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
14+
<afterSyncTasks>
15+
<task>generateDebugSources</task>
16+
</afterSyncTasks>
1717
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1818
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1919
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -22,63 +22,75 @@
2222
</configuration>
2323
</facet>
2424
</component>
25-
<component name="NewModuleRootManager" inherit-compiler-output="false">
25+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2626
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
27+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2728
<exclude-output />
2829
<content url="file://$MODULE_DIR$">
2930
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3031
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3132
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3233
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3335
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
40-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4144
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4245
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4346
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4447
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4548
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
46-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4749
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
4858
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
4959
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5060
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5161
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5262
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
53-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5463
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
5565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
5666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
5767
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
5868
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
5969
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
60-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6170
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
6279
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
63-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
6481
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
65-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
66-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
67-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
6982
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
72-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7485
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
7686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
7887
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
7988
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
8090
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
8192
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
8294
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8395
</content>
8496
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
@@ -88,5 +100,4 @@
88100
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
89101
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
90102
</component>
91-
</module>
92-
103+
</module>

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 21
5-
buildToolsVersion "21.1.2"
5+
buildToolsVersion '25.0.0'
66

77
defaultConfig {
88
applicationId "org.c_base.pymlgame.controller"

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.0.0'
8+
classpath 'com.android.tools.build:gradle:2.3.1'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Thu May 04 21:15:27 CEST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 commit comments

Comments
 (0)