From 9c064db05d5136786a70503f9b02a9476625ca10 Mon Sep 17 00:00:00 2001 From: mmk2410 Date: Mon, 3 Aug 2015 17:51:38 +0200 Subject: [PATCH] Release 2.3.0 --- app/build.gradle | 4 +-- app/manifest-merger-release-report.txt | 43 +++++++++++--------------- app/src/main/res/values-de/strings.xml | 3 +- app/src/main/res/values/strings.xml | 3 +- 4 files changed, 22 insertions(+), 31 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 35c0710..e13c7e0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "de.marcelkapfer.morseconverter" minSdkVersion 15 targetSdkVersion 22 - versionCode 227 - versionName "2.2.7" + versionCode 230 + versionName "2.3.0 beta" } buildTypes { release { diff --git a/app/manifest-merger-release-report.txt b/app/manifest-merger-release-report.txt index 28c0aa0..c131b00 100644 --- a/app/manifest-merger-release-report.txt +++ b/app/manifest-merger-release-report.txt @@ -15,17 +15,16 @@ ADDED from AndroidManifest.xml:23:1 INJECTED from AndroidManifest.xml:0:0 application ADDED from AndroidManifest.xml:26:5 -MERGED from com.android.support:appcompat-v7:22.0.0:22:5 -MERGED from com.android.support:support-v4:22.0.0:22:5 +MERGED from com.android.support:appcompat-v7:22.2.1:22:5 +MERGED from com.android.support:support-v4:22.2.1:22:5 MERGED from it.neokree:MaterialNavigationDrawer:1.3.3:14:5 -MERGED from com.android.support:appcompat-v7:22.0.0:22:5 -MERGED from com.android.support:support-v4:22.0.0:22:5 +MERGED from com.android.support:appcompat-v7:22.2.1:22:5 +MERGED from com.android.support:support-v4:22.2.1:22:5 MERGED from com.balysv:material-ripple:1.0.1:12:5 -MERGED from com.android.support:cardview-v7:21.0.3:16:5 -MERGED from com.android.support:support-v4:22.0.0:22:5 -MERGED from com.android.support:recyclerview-v7:21.0.3:17:5 -MERGED from com.android.support:support-v4:22.0.0:22:5 -MERGED from com.anjlab.android.iab.v3:library:1.0.24:13:5 +MERGED from com.android.support:cardview-v7:22.2.1:22:5 +MERGED from com.android.support:support-v4:22.2.1:22:5 +MERGED from com.android.support:support-v4:22.2.1:22:5 +MERGED from com.anjlab.android.iab.v3:library:1.0.26:13:5 android:label ADDED from AndroidManifest.xml:29:9 android:allowBackup @@ -52,22 +51,22 @@ ADDED from AndroidManifest.xml:37:17 ADDED from AndroidManifest.xml:37:27 uses-permission#com.android.vending.BILLING ADDED from AndroidManifest.xml:42:5 -MERGED from com.anjlab.android.iab.v3:library:1.0.24:11:5 +MERGED from com.anjlab.android.iab.v3:library:1.0.26:11:5 android:name ADDED from AndroidManifest.xml:42:22 uses-sdk INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested -MERGED from com.android.support:appcompat-v7:22.0.0:20:5 -MERGED from com.android.support:support-v4:22.0.0:20:5 +MERGED from com.android.support:appcompat-v7:22.2.1:20:5 +MERGED from com.android.support:support-v4:22.2.1:20:5 MERGED from it.neokree:MaterialNavigationDrawer:1.3.3:8:5 -MERGED from com.android.support:appcompat-v7:22.0.0:20:5 -MERGED from com.android.support:support-v4:22.0.0:20:5 +MERGED from com.android.support:appcompat-v7:22.2.1:20:5 +MERGED from com.android.support:support-v4:22.2.1:20:5 MERGED from com.balysv:material-ripple:1.0.1:8:5 -MERGED from com.android.support:cardview-v7:21.0.3:15:5 -MERGED from com.android.support:support-v4:22.0.0:20:5 -MERGED from com.android.support:recyclerview-v7:21.0.3:15:5 -MERGED from com.android.support:support-v4:22.0.0:20:5 -MERGED from com.anjlab.android.iab.v3:library:1.0.24:7:5 +MERGED from com.android.support:cardview-v7:22.2.1:20:5 +MERGED from com.android.support:support-v4:22.2.1:20:5 +MERGED from com.android.support:recyclerview-v7:22.2.1:20:5 +MERGED from com.android.support:support-v4:22.2.1:20:5 +MERGED from com.anjlab.android.iab.v3:library:1.0.26:7:5 tools:overrideLibrary ADDED from it.neokree:MaterialNavigationDrawer:1.3.3:11:9 android:targetSdkVersion @@ -76,9 +75,3 @@ MERGED from com.anjlab.android.iab.v3:library:1.0.24:7:5 android:minSdkVersion INJECTED from AndroidManifest.xml:0:0 INJECTED from AndroidManifest.xml:0:0 -activity#android.support.v7.widget.TestActivity -ADDED from com.android.support:recyclerview-v7:21.0.3:18:9 - android:label - ADDED from com.android.support:recyclerview-v7:21.0.3:18:19 - android:name - ADDED from com.android.support:recyclerview-v7:21.0.3:18:60 diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1c15168..d8fddb4 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -25,7 +25,6 @@ Morse Converter Einstellungen Geben Sie einen Text ein - UMWANDELN Ihr Text Hallo Welt Suche @@ -37,7 +36,7 @@ Wenn Du einen Fehler gefunden hast, schreibe mir bitte ein E-Mail an marcelmichaelkapfer@yahoo.co.nz Du kannst eine ausführliche Anleitung auf marcel-kapfer.de/writtenmorse/index.html#howto_android finden. Wenn Du auf einen fehlenden Code aufmerksam geworden bist, dann schreibe eine E-Mail an marcelmichaelkapfer@yahoo.co.nz. - 2.2.7 \n01. Juni 2015 + 2.3.0 \n03. August 2015 Fehler Kontakt Entwickler diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 281118e..06fdc95 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -25,7 +25,6 @@ Morse Converter Settings Enter a Message - CONVERT Your Message Hello world! Search @@ -42,7 +41,7 @@ How to Missing Code - 2.2.7 \n01 June 2015 + 2.3.0 beta \n03 August 2015 Marcel Michael Kapfer marcel-kapfer.de/writtenmorse marcelmichaelkapfer@yahoo.co.nz