Merge v1.8 into develop

This commit is contained in:
Jare Guo
2018-04-04 17:09:08 +08:00
10 changed files with 23 additions and 23 deletions
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
compileSdkVersion 26
buildToolsVersion "26.0.2"
defaultConfig {
minSdkVersion 10
targetSdkVersion 22
minSdkVersion 14
targetSdkVersion 26
versionCode 1
versionName "1.0"
}
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 22
compileSdkVersion 26
buildToolsVersion '26.0.2'
defaultConfig {
minSdkVersion 10
targetSdkVersion PROP_TARGET_SDK_VERSION
minSdkVersion PROP_TARGET_SDK_VERSION
targetSdkVersion 26
versionCode 1
versionName "1.0"
}
@@ -3,13 +3,13 @@ import org.apache.tools.ant.taskdefs.condition.Os
apply plugin: 'com.android.application'
android {
compileSdkVersion 22
compileSdkVersion 26
buildToolsVersion '26.0.2'
defaultConfig {
applicationId "org.cocos2dx.hellojavascript"
minSdkVersion 10
targetSdkVersion PROP_TARGET_SDK_VERSION
minSdkVersion PROP_TARGET_SDK_VERSION
targetSdkVersion 26
versionCode 1
versionName "1.0"
@@ -17,7 +17,7 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
PROP_TARGET_SDK_VERSION=22
PROP_TARGET_SDK_VERSION=14
PROP_APP_ABI=armeabi-v7a
RELEASE_STORE_FILE=
@@ -3,13 +3,13 @@ import org.apache.tools.ant.taskdefs.condition.Os
apply plugin: 'com.android.application'
android {
compileSdkVersion 22
compileSdkVersion 26
buildToolsVersion '26.0.2'
defaultConfig {
applicationId "org.cocos2d.helloworld"
minSdkVersion 10
targetSdkVersion PROP_TARGET_SDK_VERSION
minSdkVersion PROP_TARGET_SDK_VERSION
targetSdkVersion 26
versionCode 1
versionName "1.0"
@@ -17,7 +17,7 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
PROP_TARGET_SDK_VERSION=22
PROP_TARGET_SDK_VERSION=14
PROP_APP_ABI=armeabi-v7a
RELEASE_STORE_FILE=
@@ -3,13 +3,13 @@ import org.apache.tools.ant.taskdefs.condition.Os
apply plugin: 'com.android.application'
android {
compileSdkVersion 22
compileSdkVersion 26
buildToolsVersion '26.0.2'
defaultConfig {
applicationId "org.cocos2dx.hellojavascript"
minSdkVersion 10
targetSdkVersion PROP_TARGET_SDK_VERSION
minSdkVersion PROP_TARGET_SDK_VERSION
targetSdkVersion 26
versionCode 1
versionName "1.0"
@@ -17,7 +17,7 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
PROP_TARGET_SDK_VERSION=22
PROP_TARGET_SDK_VERSION=14
PROP_APP_ABI=armeabi-v7a
RELEASE_STORE_FILE=
@@ -3,13 +3,13 @@ import org.apache.tools.ant.taskdefs.condition.Os
apply plugin: 'com.android.application'
android {
compileSdkVersion 22
compileSdkVersion 26
buildToolsVersion '26.0.2'
defaultConfig {
applicationId "org.cocos2d.helloworld"
minSdkVersion 10
targetSdkVersion PROP_TARGET_SDK_VERSION
minSdkVersion PROP_TARGET_SDK_VERSION
targetSdkVersion 26
versionCode 1
versionName "1.0"
@@ -17,7 +17,7 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
PROP_TARGET_SDK_VERSION=22
PROP_TARGET_SDK_VERSION=14
PROP_APP_ABI=armeabi:armeabi-v7a:arm64-v8a:x86
RELEASE_STORE_FILE=debug.keystore