piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest libraries, use correct version name

Browse Source
This commit is contained in:
Tim Mutton
2017-03-20 20:48:07 +11:00
parent d20bb985ad
commit 6b704f5059
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Android/app/build.gradle
View File

@ -21,10 +21,9 @@ android {
targetSdkVersion 25 targetSdkVersion 25
// TODO This should be set to the Buildbot build number for release builds, and be "1" for debug builds. // 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 "${getVersion()}"
versionName "0.13"
} }
signingConfigs { signingConfigs {
@ -71,14 +70,18 @@ android {
} }
} }
ext {
androidSupportVersion = '25.2.0'
}
dependencies { dependencies {
compile 'com.android.support:support-v13:25.3.0' compile "com.android.support:support-v13:$androidSupportVersion"
compile 'com.android.support:cardview-v7:25.3.0' compile "com.android.support:cardview-v7:$androidSupportVersion"
compile 'com.android.support:recyclerview-v7:25.3.0' compile "com.android.support:recyclerview-v7:$androidSupportVersion"
compile 'com.android.support:design:25.3.0' compile "com.android.support:design:$androidSupportVersion"
// Android TV UI libraries. // 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 // For showing the banner as a circle a-la Material Design Guidelines
compile 'de.hdodenhof:circleimageview:2.1.0' compile 'de.hdodenhof:circleimageview:2.1.0'
@ -89,3 +92,7 @@ dependencies {
// Allows FRP-style asynchronous operations in Android. // Allows FRP-style asynchronous operations in Android.
compile 'io.reactivex:rxandroid:1.2.1' compile 'io.reactivex:rxandroid:1.2.1'
} }
def getVersion() {
return 'git describe --abbrev=0'.execute([], project.rootDir).text.trim()
}

3
Source/Android/app/src/main/res/values/strings.xml
View File

@ -239,8 +239,5 @@
<string name="header_wiimote_general">General</string> <string name="header_wiimote_general">General</string>
<string name="header_controllers">Controllers</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> <string name="write_permission_needed">You need to allow write access to external storage for the emulator to work</string>
</resources> </resources>

5
Source/Android/build.gradle
View File

@ -1,14 +1,9 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.0' 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
} }
} }