Commit d26a0289 authored by John Taylor's avatar John Taylor

Updated version numbers, what's new (should have been checked in for 1414 release....).

Upgraded android studio 2 and gradle upgrade.
parent 7b454350
......@@ -50,6 +50,9 @@
<option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
<option name="ANNOTATION_PARAMETER_WRAP" value="1" />
</JavaCodeStyleSettings>
<MultiMarkdownCodeStyleSettings>
<option name="RIGHT_MARGIN" value="72" />
</MultiMarkdownCodeStyleSettings>
<Objective-C-extensions>
<option name="GENERATE_INSTANCE_VARIABLES_FOR_PROPERTIES" value="ASK" />
<option name="RELEASE_STYLE" value="IVAR" />
......@@ -79,9 +82,7 @@
</extensions>
</Objective-C-extensions>
<XML>
<option name="XML_KEEP_LINE_BREAKS" value="false" />
<option name="XML_ALIGN_ATTRIBUTES" value="false" />
<option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML>
<codeStyleSettings language="JAVA">
<option name="RIGHT_MARGIN" value="100" />
......@@ -133,7 +134,7 @@
<match>
<AND>
<NAME>xmlns:android</NAME>
<XML_NAMESPACE />
<XML_NAMESPACE>Namespace:</XML_NAMESPACE>
</AND>
</match>
</rule>
......@@ -143,7 +144,7 @@
<match>
<AND>
<NAME>xmlns:.*</NAME>
<XML_NAMESPACE />
<XML_NAMESPACE>Namespace:</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
......
......@@ -13,6 +13,13 @@
<option value="$PROJECT_DIR$/tools" />
</set>
</option>
<option name="myModules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/tools" />
</set>
</option>
</GradleProjectSettings>
</option>
</component>
......
......@@ -9,7 +9,7 @@ android {
applicationId "com.google.android.stardroid"
minSdkVersion 15
targetSdkVersion 23
versionCode 1413
versionCode 1414
versionName "1.8.3"
buildConfigField 'String', 'GOOGLE_ANALYTICS_CODE', '""'
}
......
......@@ -5,7 +5,7 @@
<h1>New in version %s</h1>
\t • Fixed gallery search <br/>
\t • Change Cassiopeia to the more popular W shape <br/>
\t • Extra high damping - should reduce the jitters
\t • Extra high damping - should help reduce the jitters <br/>
\t • Provide clearer guidance to Android 6 users on enabling location
]]>
</string>
......
......@@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.5.0'
classpath 'com.android.tools.build:gradle:2.0.0'
// Specified as going here by the Analytics instructions.
classpath 'com.google.gms:google-services:2.0.0-alpha6'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment