diff options
| author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2019-03-19 20:25:07 -0400 |
|---|---|---|
| committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2019-03-19 20:25:07 -0400 |
| commit | ba90a2166011077795ff4e9d65a7c2df9fa9d999 (patch) | |
| tree | b4e6b33d96f052a74053e8c4738e3c0d7ce5d234 | |
| parent | dd45f46e09f3405a25ba8325d2060d0832b5d323 (diff) | |
| parent | 175eea9c90bdb85fe6a20282925243cc334e2767 (diff) | |
| download | sdl_android-ba90a2166011077795ff4e9d65a7c2df9fa9d999.tar.gz | |
Merge branch 'release/4.8.0-rc1' into feature/one_versionfeature/one_version
# Conflicts:
# android/sdl_android/build.gradle
# javaEE/build.gradle
# javaSE/build.gradle
| -rw-r--r-- | android/sdl_android/build.gradle | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/sdl_android/build.gradle b/android/sdl_android/build.gradle index 9b330d6b6..cce904a1c 100644 --- a/android/sdl_android/build.gradle +++ b/android/sdl_android/build.gradle @@ -5,7 +5,7 @@ android { defaultConfig { minSdkVersion 8 targetSdkVersion 26 - versionCode 10 + versionCode 11 versionName new File(projectDir.path, ('/../../VERSION')).text.trim() testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" resValue "string", "SDL_LIB_VERSION", '\"' + versionName + '\"' |