Fix compile, automate compile w/ hash information

Restore existing compiled archive naming structure Specify apache versions, Logging is redundant Rename build product for release artifact
2018-03-24 14:01:29 -04:00 · 2018-03-24 14:01:29 -04:00 · ee9843de66
parent 4f57f69472
commit ee9843de66
14 changed files with 26 additions and 45 deletions
--- a/shell/android-studio/app/build.gradle
+++ b/shell/android-studio/app/build.gradle
@ -30,16 +30,31 @@ android {
    }
 }

+afterEvaluate {
+    android.applicationVariants.all {  v ->
+        if (v.buildType.name == "release") {
+            def hashtag = new ByteArrayOutputStream()
+            exec {
+                commandLine "git", "rev-parse", "HEAD"
+                standardOutput = hashtag
+            }
+            hashtag = hashtag.toString().trim()
+            v.outputs.each { output ->
+                output.outputFile = new File(output.outputFile.parent,
+                        "reicast-android-" + hashtag.substring(0,7) + ".apk")
+            }
+            file('src/main/assets/build').text = hashtag
+        }
+    }
+}
+
 dependencies {
    compile 'com.android.support:support-v4:25.3.1'
    compile 'org.bouncycastle:bcprov-jdk16:1.46'
-    compile files('libs/com.bda.controller.jar')
-    compile 'commons-io:commons-io:+'
-    compile 'org.apache.commons:commons-lang3:+'
-    compile 'commons-logging:commons-logging:+'
-    compile files('libs/dropbox-android-sdk-1.6.1.jar')
-    compile files('libs/image-uniload.jar')
-    compile 'com.googlecode.json-simple:json-simple:1.1.1'
-    compile files('libs/ouya-sdk.jar')
-    //compile 'com.dropbox.core:dropbox-core-sdk:3.0.6'
+    compile 'commons-io:commons-io:2.6'
+    compile 'org.apache.commons:commons-lang3:3.7'
+    compile ('com.googlecode.json-simple:json-simple:1.1.1') {
+        exclude module: 'junit'
+    }
+    compile fileTree(include: ['*.jar'], dir: 'libs')
 }
--- a/shell/android-studio/app/src/main/assets/build
+++ b/shell/android-studio/app/src/main/assets/build
@ -1 +1 @@
-0dba81b99abcf909937d6473bb7e5fc83bf33e6d
+317aa4c040a436922fb53c61d04df4a9a9dacd0c
--- a/shell/android-studio/app/src/main/res/values-da/strings.xml
+++ b/shell/android-studio/app/src/main/res/values-da/strings.xml
@ -94,9 +94,6 @@
    <string name="about">Om</string>
    <string name="rateme">Bedøm mig</string>
    <string name="messages">Troubleshoot</string>
-    
-    <string name="textOn">TIL</string>
-    <string name="textOff">FRA</string>

    <string name="cancel">Afbryd</string>
    <string name="dismiss">Afvis</string>
--- a/shell/android-studio/app/src/main/res/values-de/strings.xml
+++ b/shell/android-studio/app/src/main/res/values-de/strings.xml
@ -104,9 +104,6 @@
    <string name="rateme">Bewerten</string>
    <string name="messages">Logdateien senden</string>
    <string name="cloud">Cloud-VMU</string>
-    
-    <string name="textOn">Ein</string>
-    <string name="textOff">Aus</string>

    <string name="cancel">Abbrechen</string>
    <string name="dismiss">Verwerfen</string>
--- a/shell/android-studio/app/src/main/res/values-es/strings.xml
+++ b/shell/android-studio/app/src/main/res/values-es/strings.xml
@ -65,8 +65,5 @@
    <string name="input">Entrada</string>
    <string name="about">Acerca de</string>
    <string name="rateme">Rate Me</string>
-    
-    <string name="textOn">EN</string>
-    <string name="textOff">OFF</string>

 </resources>
--- a/shell/android-studio/app/src/main/res/values-fr/strings.xml
+++ b/shell/android-studio/app/src/main/res/values-fr/strings.xml
@ -101,9 +101,6 @@ Last Edit: 21 May 2014
    <string name="rateme">Evaluez-nous</string>
    <string name="messages">Test Suite</string>
    <string name="cloud">Cloud VMU</string>
-     
-    <string name="textOn">ACTIF</string>
-    <string name="textOff">DESACT.</string>
 
    <string name="cancel">Annuler</string>
    <string name="dismiss">Abandonner</string>
--- a/shell/android-studio/app/src/main/res/values-it/strings.xml
+++ b/shell/android-studio/app/src/main/res/values-it/strings.xml
@ -101,9 +101,6 @@
    <string name="rateme">Votami</string>
    <string name="messages">Test Suite</string>
    <string name="cloud">Cloud VMU</string>
-    
-    <string name="textOn">Attivo</string>
-    <string name="textOff">Inattivo</string>

    <string name="cancel">Cancella</string>
    <string name="dismiss">Scartare</string>
--- a/shell/android-studio/app/src/main/res/values-jp/strings.xml
+++ b/shell/android-studio/app/src/main/res/values-jp/strings.xml
@ -87,9 +87,6 @@
    <string name="rateme">私を評価してください</string>
    <string name="messages">テストスイート</string>
    
-    <string name="textOn">オン</string>
-    <string name="textOff">オフ</string>
-    
    <string name="cancel">キャンセル</string>
    <string name="manual">マニュアル</string>
    
--- a/shell/android-studio/app/src/main/res/values-ko/strings.xml
+++ b/shell/android-studio/app/src/main/res/values-ko/strings.xml
@ -69,9 +69,6 @@
    <string name="about">정보</string>
    <string name="rateme">별점 평가</string>
    
-    <string name="textOn">ON</string>
-    <string name="textOff">OFF</string>
-    
    <string name="cancel">취소</string>
    <string name="dismiss">Dismiss</string>
    <string name="manual">Manual</string>
--- a/shell/android-studio/app/src/main/res/values-pl/strings.xml
+++ b/shell/android-studio/app/src/main/res/values-pl/strings.xml
@ -67,8 +67,5 @@
    <string name="input">Kontrolery</string>
    <string name="about">O nas</string>
    <string name="rateme">Oceń nas</string>
-    
-    <string name="textOn">WŁ</string>
-    <string name="textOff">WYŁ</string>

 </resources>
--- a/shell/android-studio/app/src/main/res/values-pt/strings.xml
+++ b/shell/android-studio/app/src/main/res/values-pt/strings.xml
@ -104,10 +104,7 @@
    <string name="about">Sobre</string>
    <string name="rateme">Avaliar</string>
    <string name="messages">Enviar Logs</string>
-    <string name="cloud">VMU na Nuvem</string>	
-    
-    <string name="textOn">LIG</string>
-    <string name="textOff">DESL</string>
+    <string name="cloud">VMU na Nuvem</string>
    
    <string name="cancel">Cancelar</string>
    <string name="dismiss">Destituir</string>	
--- a/shell/android-studio/app/src/main/res/values-ru/strings.xml
+++ b/shell/android-studio/app/src/main/res/values-ru/strings.xml
@ -146,7 +146,4 @@
    <string name="popup_button_frame_limit">Ограничение FPS</string>
    <string name="popup_button_audio">Эмуляция звука</string>
    <string name="popup_button_turbo">Турбо-режим</string>
-    
-    <string name="textOn">ВКЛ</string>
-    <string name="textOff">ВЫКЛ</string>
 </resources>
--- a/shell/android-studio/app/src/main/res/values-zh-rCN/strings.xml
+++ b/shell/android-studio/app/src/main/res/values-zh-rCN/strings.xml
@ -64,8 +64,6 @@
    <string name="input">输入</string>
    <string name="about">关于</string>
    <string name="rateme">评价我</string>
-    <string name="textOn">开</string>
-    <string name="textOff">关</string>

    <string name="bios_config">请生成一个配置\n（运行至少一次BIOS）</string>

--- a/shell/android-studio/app/src/main/res/values-zh/strings.xml
+++ b/shell/android-studio/app/src/main/res/values-zh/strings.xml
@ -64,8 +64,6 @@
    <string name="input">輸入</string>
    <string name="about">關於</string>
    <string name="rateme">評價我</string>
-    <string name="textOn">開</string>
-    <string name="textOff">關</string>

    <string name="bios_config">請生成一個配置\n（運行至少一次BIOS）</string>