Skip to content

Commit 1e110ee

Browse files
cprcrackcprcrack
authored
Merge pull request #29 from rdp/master
update gradle/API
2 parents 6e5f943 + a603909 commit 1e110ee

5 files changed

Lines changed: 52 additions & 36 deletions

File tree

‎VideoEnabledWebView.iml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +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" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id="VideoEnabledWebView" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" 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="true">
11+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
1112
<exclude-output />
1213
<content url="file://$MODULE_DIR$">
1314
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1415
</content>
15-
<orderEntry type="inheritedJdk" />
16+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1617
<orderEntry type="sourceFolder" forTests="false" />
1718
</component>
18-
</module>
19-
19+
</module>

‎app/app.iml‎

Lines changed: 43 additions & 27 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" external.system.module.group="VideoEnabledWebView" external.system.module.version="unspecified" 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" external.system.module.group="VideoEnabledWebView" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -9,12 +9,11 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1312
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1413
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
17-
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
14+
<afterSyncTasks>
15+
<task>generateDebugSources</task>
16+
</afterSyncTasks>
1817
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1918
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2019
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -23,71 +22,88 @@
2322
</configuration>
2423
</facet>
2524
</component>
26-
<component name="NewModuleRootManager" inherit-compiler-output="false">
25+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2726
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
28-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
27+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2928
<exclude-output />
3029
<content url="file://$MODULE_DIR$">
3130
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3231
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3332
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3433
<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" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4040
<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" />
4142
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4344
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4445
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4546
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4647
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4748
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
48-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4949
<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" />
5058
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5159
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5260
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5361
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5462
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5663
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
5772
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
5873
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
5974
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6075
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6176
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
62-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6377
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
6479
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
65-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
6681
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
67-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
69-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7182
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
72-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7690
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
8092
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
8194
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
8297
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
8399
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
84100
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
85101
</content>
86102
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
87103
<orderEntry type="sourceFolder" forTests="false" />
104+
<orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
88105
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
89106
<orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
90-
<orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
107+
<orderEntry type="library" exported="" name="android-android-22" level="project" />
91108
</component>
92-
</module>
93-
109+
</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 22
5-
buildToolsVersion "22.0.1"
5+
buildToolsVersion '25.0.0'
66

77
defaultConfig {
88
applicationId "cpr.name.videoenabledwebview"

‎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.1.0'
8+
classpath 'com.android.tools.build:gradle:2.3.3'
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-
#Fri Mar 13 12:55:55 KST 2015
1+
#Mon Oct 16 21:46:15 PDT 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)