diff options
| author | Tim Mutton <tim.mutton@outware.com.au> | 2017-03-20 20:48:07 +1100 |
|---|---|---|
| committer | Tim Mutton <tim.mutton@outware.com.au> | 2017-05-04 17:13:30 +1000 |
| commit | 6b704f5059ebd12478fcaac8e4d157b30a3e1aa2 (patch) | |
| tree | f4c9063197963c4e459624b4fdd92b64d891620a /Source/Android | |
| parent | d20bb985ad6c83123d30cb582a560ee938ca7900 (diff) | |
Update to latest libraries, use correct version name
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/app/build.gradle | 23 | ||||
| -rw-r--r-- | Source/Android/app/src/main/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | Source/Android/build.gradle | 5 |
3 files changed, 15 insertions, 16 deletions
diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle index d7590156e4..7d3f59dfc6 100644 --- a/Source/Android/app/build.gradle +++ b/Source/Android/app/build.gradle @@ -21,10 +21,9 @@ android { targetSdkVersion 25 // TODO This should be set to the Buildbot build number for release builds, and be "1" for debug builds. - versionCode 13 + versionCode 1 - // TODO This should be set to the string currently provided by NativeLibrary.GetVersionString(). - versionName "0.13" + versionName "${getVersion()}" } signingConfigs { @@ -71,14 +70,18 @@ android { } } +ext { + androidSupportVersion = '25.2.0' +} + dependencies { - compile 'com.android.support:support-v13:25.3.0' - compile 'com.android.support:cardview-v7:25.3.0' - compile 'com.android.support:recyclerview-v7:25.3.0' - compile 'com.android.support:design:25.3.0' + compile "com.android.support:support-v13:$androidSupportVersion" + compile "com.android.support:cardview-v7:$androidSupportVersion" + compile "com.android.support:recyclerview-v7:$androidSupportVersion" + compile "com.android.support:design:$androidSupportVersion" // Android TV UI libraries. - compile 'com.android.support:leanback-v17:25.3.0' + compile "com.android.support:leanback-v17:$androidSupportVersion" // For showing the banner as a circle a-la Material Design Guidelines compile 'de.hdodenhof:circleimageview:2.1.0' @@ -89,3 +92,7 @@ dependencies { // Allows FRP-style asynchronous operations in Android. compile 'io.reactivex:rxandroid:1.2.1' } + +def getVersion() { + return 'git describe --abbrev=0'.execute([], project.rootDir).text.trim() +} diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index fcc9e80ed4..c85d00df52 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -239,8 +239,5 @@ <string name="header_wiimote_general">General</string> <string name="header_controllers">Controllers</string> - <!-- Package Names--> - <string name="application_id">org.dolphinemu.dolphinemu</string> - <string name="write_permission_needed">You need to allow write access to external storage for the emulator to work</string> </resources> diff --git a/Source/Android/build.gradle b/Source/Android/build.gradle index c6f2f5009e..3f806cd79c 100644 --- a/Source/Android/build.gradle +++ b/Source/Android/build.gradle @@ -1,14 +1,9 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { repositories { jcenter() } dependencies { classpath 'com.android.tools.build:gradle:2.3.0' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files } } |