Commit c065ccf333949318898a09ffe8559a230f176bb0
1 parent
e3269f2308
Exists in
master
升级4.1.5，修改gp支付生成订单号的bug
Showing 7 changed files with 2 additions and 122 deletions Side-by-side Diff
GameSDK-release4.1.4.aar
No preview for this file type
GameSDK-release4.1.5.aar
No preview for this file type
GameSDKDemo/.gitignore
GameSDKDemo/GameSDKDemo.iml
| ... | ... | @@ -1,121 +0,0 @@ |
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | -<module external.linked.project.id=":GameSDKDemo" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../../GameSDK_AS" external.system.id="GRADLE" external.system.module.group="GameSDK_AS" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> | |
| 3 | - <component name="FacetManager"> | |
| 4 | - <facet type="android-gradle" name="Android-Gradle"> | |
| 5 | - <configuration> | |
| 6 | - <option name="GRADLE_PROJECT_PATH" value=":GameSDKDemo" /> | |
| 7 | - </configuration> | |
| 8 | - </facet> | |
| 9 | - <facet type="android" name="Android"> | |
| 10 | - <configuration> | |
| 11 | - <option name="SELECTED_BUILD_VARIANT" value="debug" /> | |
| 12 | - <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> | |
| 13 | - <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> | |
| 14 | - <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> | |
| 15 | - <afterSyncTasks> | |
| 16 | - <task>generateDebugSources</task> | |
| 17 | - </afterSyncTasks> | |
| 18 | - <option name="ALLOW_USER_CONFIGURATION" value="false" /> | |
| 19 | - <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> | |
| 20 | - <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" /> | |
| 21 | - <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" /> | |
| 22 | - <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" /> | |
| 23 | - </configuration> | |
| 24 | - </facet> | |
| 25 | - </component> | |
| 26 | - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> | |
| 27 | - <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> | |
| 28 | - <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" /> | |
| 29 | - <exclude-output /> | |
| 30 | - <content url="file://$MODULE_DIR$"> | |
| 31 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" /> | |
| 32 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" /> | |
| 33 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> | |
| 34 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" /> | |
| 35 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" /> | |
| 36 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" /> | |
| 37 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" /> | |
| 38 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" /> | |
| 39 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" /> | |
| 40 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> | |
| 41 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" /> | |
| 42 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" /> | |
| 43 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" /> | |
| 44 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" /> | |
| 45 | - <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" /> | |
| 46 | - <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" /> | |
| 47 | - <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" /> | |
| 48 | - <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" /> | |
| 49 | - <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" /> | |
| 50 | - <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" /> | |
| 51 | - <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" /> | |
| 52 | - <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" /> | |
| 53 | - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" /> | |
| 54 | - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" /> | |
| 55 | - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" /> | |
| 56 | - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" /> | |
| 57 | - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" /> | |
| 58 | - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" /> | |
| 59 | - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" /> | |
| 60 | - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" /> | |
| 61 | - <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" /> | |
| 62 | - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> | |
| 63 | - <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" /> | |
| 64 | - <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" /> | |
| 65 | - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> | |
| 66 | - <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" /> | |
| 67 | - <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" /> | |
| 68 | - <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" /> | |
| 69 | - <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" /> | |
| 70 | - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> | |
| 71 | - <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" /> | |
| 72 | - <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" /> | |
| 73 | - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> | |
| 74 | - <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" /> | |
| 75 | - <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" /> | |
| 76 | - <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" /> | |
| 77 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" /> | |
| 78 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" /> | |
| 79 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" /> | |
| 80 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" /> | |
| 81 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" /> | |
| 82 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" /> | |
| 83 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" /> | |
| 84 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" /> | |
| 85 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> | |
| 86 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> | |
| 87 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" /> | |
| 88 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" /> | |
| 89 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/GameSDK-release4.1.4/jars" /> | |
| 90 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" /> | |
| 91 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" /> | |
| 92 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> | |
| 93 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" /> | |
| 94 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" /> | |
| 95 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" /> | |
| 96 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" /> | |
| 97 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" /> | |
| 98 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" /> | |
| 99 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" /> | |
| 100 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> | |
| 101 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" /> | |
| 102 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" /> | |
| 103 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> | |
| 104 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" /> | |
| 105 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> | |
| 106 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" /> | |
| 107 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> | |
| 108 | - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" /> | |
| 109 | - <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> | |
| 110 | - <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> | |
| 111 | - </content> | |
| 112 | - <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" /> | |
| 113 | - <orderEntry type="sourceFolder" forTests="false" /> | |
| 114 | - <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" /> | |
| 115 | - <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" /> | |
| 116 | - <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" /> | |
| 117 | - <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" /> | |
| 118 | - <orderEntry type="library" exported="" name="GameSDK-release4.1.4-" level="project" /> | |
| 119 | - <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" /> | |
| 120 | - </component> | |
| 121 | -</module> | |
| 122 | 0 | \ No newline at end of file |
GameSDKDemo/build.gradle
GameSDKDemo/libs/GameSDK-release4.1.4.aar
No preview for this file type
GameSDKDemo/libs/GameSDK-release4.1.5.aar
No preview for this file type