Re-enable NoNonsenseNotes

The app now has the option of building a Free version, so re-enabling
it and updating information.

I was unable to configure any automatic update check since the version
is located in 5 different integer fields in build.gradle.

Added patch to remove proprietary configs from gradle

Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>
This commit is contained in:
Jonas Kalderstam 2014-10-28 23:13:31 +01:00
parent ca905e2dc3
commit 4e0c91ad5c
2 changed files with 94 additions and 14 deletions

View file

@ -1,25 +1,17 @@
Disabled:Disable until FOSS branch created, or until GMS patch and local sync can be achieved
Categories:Office
License:Apache2
Web Site:https://github.com/spacecowboy/NotePad
Source Code:https://github.com/spacecowboy/NotePad
Issue Tracker:https://github.com/spacecowboy/NotePad/issues
Bitcoin:1Bt9RVseU3cLTPbc1hqUgU9UtGgi9iNL8r
Bitcoin:16DUL1X4yARfM88GN7TV6Y3wQwqrstJs7A
Name:NoNonsense Notes
Auto Name:Notes
Summary:Simple notepad
Summary:Notepad and todo app with sync support.
Description:
N.B. The syncing with Google Tasks won't work because there are
no API keys in the source code. That means there isn't a way of
backing up your notes yet, unless you have Android 4.1+
and the SDK installed on a desktop, or have root access.
Notepad and todo list app with a modern look.
.
Requires Root:Yes
Repo Type:git
Repo:https://github.com/spacecowboy/NotePad.git
@ -74,8 +66,14 @@ Build:5.0,88
init=rm -f build.xml custom_rules.xml
prebuild=rm -f *.zip *.png *.7z *.psd
Auto Update Mode:None
Update Check Mode:Tags
Current Version:5.1.3
Current Version Code:106
Build:5.5,55000
commit=5.5
subdir=app
patch=remove_play_configs.patch
gradle=free
prebuild=rm -rf *.zip *.png *.7z *.psd src/play src/playBeta src/androidTest
Auto Update Mode:None
Update Check Mode:None
Current Version:5.5
Current Version Code:55000

View file

@ -0,0 +1,82 @@
From 138239b76870e1297d205679a4ff26b6e16eb552 Mon Sep 17 00:00:00 2001
From: Jonas Kalderstam <jonas@kalderstam.se>
Date: Wed, 29 Oct 2014 15:34:42 +0100
Subject: [PATCH] Remove play configs for fdroid
Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>
---
app/build.gradle | 45 ---------------------------------------------
1 file changed, 45 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 94f54fe..7ca8a43 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -83,27 +83,6 @@ android {
productFlavors {
free {}
- play {
- // If Non-Free libraries are to be used
- buildConfigField "boolean", "NONFREE", "true"
- }
- playBeta {
- // Beta runs at +1
- versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild * 10 + 1
-
- buildConfigField "boolean", "DROPBOX_ENABLED", "true"
- // If Non-Free libraries are to be used
- buildConfigField "boolean", "NONFREE", "true"
- }
- }
-
- sourceSets {
- playBeta {
- // Include play sources
- java.srcDirs = ['src/play/java']
- res.srcDirs = ['src/play/res', 'src/playBeta/res']
- manifest.srcFile 'src/play/AndroidManifest.xml'
- }
}
if (project.hasProperty('STORE_FILE')) {
@@ -143,20 +122,6 @@ apt {
}
}
-// Dropbox
-task nativeLibsToJar(type: Zip) {
- destinationDir file("$buildDir/native-libs")
- baseName 'native-libs'
- extension 'jar'
- from fileTree(dir: 'src/playBeta/libs', include: '**/*.so')
- into 'lib/'
-}
-
-// If non-free, depend on dropbox
-tasks.withType(JavaCompile) {
- compileTask -> if (compileTask.toString().contains("Play")) compileTask.dependsOn(nativeLibsToJar)
-}
-
dependencies {
compile fileTree(dir: 'libs', include: '*.jar')
compile 'com.android.support:support-v4:19.0.1+'
@@ -170,14 +135,4 @@ dependencies {
// annotations
apt "org.androidannotations:androidannotations:$AAVersion"
compile "org.androidannotations:androidannotations-api:$AAVersion"
- // Dropbox and non-free stuff
- playCompile fileTree(dir: 'src/play/libs', include: '*.jar')
- playBetaCompile fileTree(dir: 'src/play/libs', include: '*.jar')
- playCompile fileTree(dir: "$buildDir/native-libs", include: "*.jar")
- playCompile 'com.google.android.gms:play-services:+'
- playBetaCompile fileTree(dir: "$buildDir/native-libs", include: "*.jar")
- playBetaCompile 'com.google.android.gms:play-services:+'
- // Tests
- androidTestCompile 'com.squareup.spoon:spoon-client:1.1.1+'
-
}
\ No newline at end of file
--
2.1.1