Update to latest libraries, use correct version name
This commit is contained in:
parent
d20bb985ad
commit
6b704f5059
|
@ -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()
|
||||
}
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue