Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-01 19:57:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'from_android_beta_106' into android_branch

Browse source
This commit is contained in:
Eric House 2016-05-03 06:44:39 -07:00
commit 608533d189
4 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/XWords4/AndroidManifest.xml
View file

@ -22,7 +22,7 @@
to come from a domain that you own or have control over. --> to come from a domain that you own or have control over. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.eehouse.android.xw4" package="org.eehouse.android.xw4"
android:versionCode="100" android:versionCode="101"
android:versionName="@string/app_version" android:versionName="@string/app_version"
> >

12
xwords4/android/XWords4/app/build.gradle
View file

@ -115,6 +115,18 @@ android {
} }
} }
// Prevent release builds. They haven't been tested, and now that
// f-droid has been releasing them they're KNOWN not to work.
android.applicationVariants.all { variant ->
if ( variant.name.endsWith("Release") ) {
String NAME = "check" + variant.name.capitalize() + "Manifest"
task "$NAME"(overwrite: true) << {
throw new RuntimeException('<<<<< Release builds should not be built '
+ 'using gradle! Please use ant for now. >>>>>');
}
}
}
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
} }

11
xwords4/android/XWords4/assets/changes.html
View file

@ -13,9 +13,10 @@
</style> </style>
</head> </head>
<body> <body>
<h2>Crosswords 4.4.106 release</h2> <h2>Crosswords 4.4.107 release</h2>
<p>This version improves chat display and battery life</p> <p>This version, for F-droid release only, fixes build problems that
caused a number of crashes and other issues.</p>
<div id="survey"> <div id="survey">
<p>Please <a href="https://www.surveymonkey.com/s/GX3XLHR">take <p>Please <a href="https://www.surveymonkey.com/s/GX3XLHR">take
@ -25,11 +26,7 @@
<h3>New with this release</h3> <h3>New with this release</h3>
<ul> <ul>
<li>Reduce power usage by combining all green-to-red turn-length <li>Force release builds to be done with ant rather than gradle</li>
timers into one</li>
<li>Include player names in chat display</li>
<li>Revert recent change preventing multiple checks in SMS and
Bluetooth invitation dialogs</li>
</ul> </ul>
<p>(The full changelog <p>(The full changelog

2
xwords4/android/XWords4/res/values/app_name.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_version">4.4.106</string> <string name="app_version">4.4.107</string>
</resources> </resources>