From 8bc1e4b5d134e74afcb20163af1b554e57eaebee Mon Sep 17 00:00:00 2001
From: 1C3 <riccardo@ice.ovh>
Date: Sun, 1 May 2016 02:19:01 +0200
Subject: [PATCH] update release
---
.idea/workspace.xml | 58 +++++++++++++++-----------------
app/app.iml | 3 --
app/build.gradle | 4 +--
app/src/main/AndroidManifest.xml | 4 +--
4 files changed, 32 insertions(+), 37 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9b09c6411..6393aa7d6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,12 +10,10 @@
</component>
<component name="ChangeListManager">
<list default="true" id="465ea6dc-8a6c-4c2f-9b3c-de0cba274c5a" name="Default" comment="">
- <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/hamcrest_core_1_3.xml" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/junit_4_12.xml" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build.gradle" afterPath="$PROJECT_DIR$/app/build.gradle" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
</list>
<ignored path="ICEcons.iws" />
<ignored path=".idea/workspace.xml" />
@@ -106,8 +104,8 @@
<file leaf-file-name="build.gradle" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.24545455">
- <caret line="12" column="5" selection-start-line="12" selection-start-column="5" selection-end-line="12" selection-end-column="5" />
+ <state vertical-scroll-proportion="0.225">
+ <caret line="11" column="25" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
<folding />
</state>
</provider>
@@ -116,8 +114,8 @@
<file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="12" column="34" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+ <state vertical-scroll-proportion="-3.3333333">
+ <caret line="5" column="30" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
<folding />
</state>
</provider>
@@ -1359,7 +1357,7 @@
</option>
<option name="modificationStamps">
<map>
- <entry key="$PROJECT_DIR$" value="4382737289719" />
+ <entry key="$PROJECT_DIR$" value="4382738075723" />
</map>
</option>
<option name="projectBuildClasspath">
@@ -1651,8 +1649,8 @@
<option value="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/LicenseActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java" />
- <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/build.gradle" />
+ <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
</list>
</option>
</component>
@@ -1692,9 +1690,9 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scratches" />
<pane id="Scope" />
<pane id="PackagesPane" />
+ <pane id="Scratches" />
<pane id="AndroidView">
<subPane>
<PATH>
@@ -2076,7 +2074,7 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="1920" height="1047" extended-state="6" />
- <editor active="false" />
+ <editor active="true" />
<layout>
<window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -2405,31 +2403,31 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/IceScreenUtils.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="25" column="1" selection-start-line="25" selection-start-column="1" selection-end-line="25" selection-end-column="1" />
+ <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/MainActivity.java">
+ <entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+ <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="12" column="34" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/settings.gradle">
+ <entry file="file://$PROJECT_DIR$/app/proguard-rules.pro">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -2437,23 +2435,23 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/build.gradle">
+ <entry file="file://$PROJECT_DIR$/local.properties">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
+ <entry file="file://$PROJECT_DIR$/gradle.properties">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <caret line="10" column="66" selection-start-line="10" selection-start-column="66" selection-end-line="10" selection-end-column="66" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/proguard-rules.pro">
+ <entry file="file://$PROJECT_DIR$/settings.gradle">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -2461,26 +2459,26 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gradle.properties">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/IceScreenUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="10" column="66" selection-start-line="10" selection-start-column="66" selection-end-line="10" selection-end-column="66" />
+ <caret line="25" column="1" selection-start-line="25" selection-start-column="1" selection-end-line="25" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/local.properties">
+ <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
+ <state vertical-scroll-proportion="-3.3333333">
+ <caret line="5" column="30" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.24545455">
- <caret line="12" column="5" selection-start-line="12" selection-start-column="5" selection-end-line="12" selection-end-column="5" />
+ <state vertical-scroll-proportion="0.225">
+ <caret line="11" column="25" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
<folding />
</state>
</provider>
diff --git a/app/app.iml b/app/app.iml
index cf9f594bb..72173d375 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -67,8 +67,6 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
@@ -77,7 +75,6 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
- <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
diff --git a/app/build.gradle b/app/build.gradle
index ae40e90c8..05b65abda 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
applicationId "ovh.ice.icecons"
minSdkVersion 16
targetSdkVersion 23
- versionCode 4
- versionName "2.0"
+ versionCode 5
+ versionName "2.1"
}
buildTypes {
release {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f31d2127c..20e8eb809 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="ovh.ice.icecons"
- android:versionCode="4"
- android:versionName="2.0"
+ android:versionCode="5"
+ android:versionName="2.1"
android:minSdkVersion="16"
android:targetSdkVersion="23" >
--
GitLab