From 065cbf36030dda41c33a4709a640cee5084d08b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=A3=D8=AD=D9=85=D8=AF=20=D8=A7=D9=84=D9=85=D8=AD=D9=85?= =?UTF-8?q?=D9=88=D8=AF=D9=8A=20=28Ahmed=20El-Mahmoudy=29?= Date: Mon, 26 May 2014 00:04:40 +0300 Subject: [PATCH 1/6] Revert "Barcode Scanner: also build android-core, use maven" v4.6.4 didn't have any java files under android-core yet. Also this change did not work for v4.7.0 This reverts commit 0a81bb269440f00b56796cec75211cdf31da4a7b. --- metadata/com.google.zxing.client.android.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/metadata/com.google.zxing.client.android.txt b/metadata/com.google.zxing.client.android.txt index e08fa6e7eb..f3bb597ddb 100644 --- a/metadata/com.google.zxing.client.android.txt +++ b/metadata/com.google.zxing.client.android.txt @@ -84,9 +84,9 @@ Build:4.6.3,98 Build:4.6.4,99 commit=BS-4.6.4 subdir=android - maven=yes - build=$$MVN3$$ package -f ../core/pom.xml && \ - $$MVN3$$ package -f ../android-core/pom.xml + target=android-19 + prebuild=echo -e "java.source=7\njava.target=7" >> local.properties + build=$$MVN3$$ package -f ../core/pom.xml Build:4.7.0,100 commit=BS-4.7.0 From 4dbcf65da5782fc605982065dbb5d98872c0c6be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=A3=D8=AD=D9=85=D8=AF=20=D8=A7=D9=84=D9=85=D8=AD=D9=85?= =?UTF-8?q?=D9=88=D8=AF=D9=8A=20=28Ahmed=20El-Mahmoudy=29?= Date: Mon, 26 May 2014 00:07:34 +0300 Subject: [PATCH 2/6] Fix build for Barcode Scanner v4.7.0 Append android-core to source.dir --- metadata/com.google.zxing.client.android.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metadata/com.google.zxing.client.android.txt b/metadata/com.google.zxing.client.android.txt index f3bb597ddb..35a5bf9681 100644 --- a/metadata/com.google.zxing.client.android.txt +++ b/metadata/com.google.zxing.client.android.txt @@ -92,7 +92,8 @@ Build:4.7.0,100 commit=BS-4.7.0 subdir=android target=android-19 - prebuild=echo -e "java.source=7\njava.target=7" >> local.properties + prebuild=echo -e "java.source=7\njava.target=7" >> local.properties && \ + echo 'source.dir=src;../android-core/src' >> project.properties build=$$MVN3$$ package -f ../core/pom.xml Auto Update Mode:Version BS-%v From 42c0412060e7b4a69c1560020a720103665e63f3 Mon Sep 17 00:00:00 2001 From: agilob Date: Sun, 25 May 2014 14:29:28 +0100 Subject: [PATCH 3/6] updated octodroif to 3.6 (version with 2FA) --- metadata/com.gh4a.txt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/metadata/com.gh4a.txt b/metadata/com.gh4a.txt index d9947eb39d..3691ddcd89 100644 --- a/metadata/com.gh4a.txt +++ b/metadata/com.gh4a.txt @@ -30,16 +30,14 @@ so updates are unlikely here. Repo Type:git Repo:https://github.com/slapperwan/gh4a.git -Build:3.2,32 - commit=5149069ae5 +Build:3.6,36 + commit=53d2e5bbfd76d8ad4a779913df7b3f193fb19a3e srclibs=ActionBarSherlock@9598f2bb2c,ViewPagerIndicator@65457eac06 - prebuild=sed -i '/Pager/d' project.properties && \ - sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \ - echo "android.library.reference.2=$$ViewPagerIndicator$$" >> project.properties && \ + prebuild=echo "android.library.reference.2=$$ViewPagerIndicator$$" >> project.properties && \ rm -rf libs/android-support-v4.jar + gradle=yes Auto Update Mode:None Update Check Mode:Static -Current Version:3.2 -Current Version Code:32 - +Current Version:3.6 +Current Version Code:36 From b363dab50a449fa9983711027183834fc9d01597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=A3=D8=AD=D9=85=D8=AF=20=D8=A7=D9=84=D9=85=D8=AD=D9=85?= =?UTF-8?q?=D9=88=D8=AF=D9=8A=20=28Ahmed=20El-Mahmoudy=29?= Date: Wed, 28 May 2014 11:46:14 +0300 Subject: [PATCH 4/6] Octodroid: Added patch to remove bugsense also remove srclibs & project.properties lines --- metadata/com.gh4a.txt | 5 ++-- metadata/com.gh4a/bugsense.patch | 40 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 metadata/com.gh4a/bugsense.patch diff --git a/metadata/com.gh4a.txt b/metadata/com.gh4a.txt index 3691ddcd89..65921cc873 100644 --- a/metadata/com.gh4a.txt +++ b/metadata/com.gh4a.txt @@ -32,9 +32,8 @@ Repo:https://github.com/slapperwan/gh4a.git Build:3.6,36 commit=53d2e5bbfd76d8ad4a779913df7b3f193fb19a3e - srclibs=ActionBarSherlock@9598f2bb2c,ViewPagerIndicator@65457eac06 - prebuild=echo "android.library.reference.2=$$ViewPagerIndicator$$" >> project.properties && \ - rm -rf libs/android-support-v4.jar + prebuild=rm -rf libs/android-support-v4.jar + patch=bugsense.patch gradle=yes Auto Update Mode:None diff --git a/metadata/com.gh4a/bugsense.patch b/metadata/com.gh4a/bugsense.patch new file mode 100644 index 0000000000..d1819c9fcf --- /dev/null +++ b/metadata/com.gh4a/bugsense.patch @@ -0,0 +1,40 @@ +diff --git a/build.gradle b/build.gradle +index 5150e12..6cd42b1 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -10,7 +10,6 @@ buildscript { + + repositories { + maven { url 'http://dl.bintray.com/populov/maven' } +- maven { url "http://www.bugsense.com/gradle/" } + maven { url 'https://github.com/kageiit/maven-repo/raw/master' } + mavenCentral() + } +@@ -50,7 +49,6 @@ android { + dependencies { + compile fileTree(dir: 'libs', include: '*.jar') + +- compile "com.bugsense.trace:bugsense:3.6" + compile 'com.android.support:support-v4:19.+' + compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar' + compile 'com.viewpagerindicator:library:2.4.1@aar' +diff --git a/src/com/gh4a/Gh4Application.java b/src/com/gh4a/Gh4Application.java +index 0e894d6..f56a934 100644 +--- a/src/com/gh4a/Gh4Application.java ++++ b/src/com/gh4a/Gh4Application.java +@@ -47,7 +47,6 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener; + import android.content.res.Configuration; + import android.graphics.Typeface; + +-import com.bugsense.trace.BugSenseHandler; + import com.gh4a.activities.Github4AndroidActivity; + + /** +@@ -99,7 +98,6 @@ public class Gh4Application extends Application implements OnSharedPreferenceCha + selectTheme(prefs.getInt("theme", Constants.Theme.DARK)); + prefs.registerOnSharedPreferenceChangeListener(this); + +- BugSenseHandler.initAndStartSession(this, "1e6a83ae"); + + mPt = new PrettyTime(); + From 2a5efeaf2029d2733aa53be631edd00b59e9df93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=A3=D8=AD=D9=85=D8=AF=20=D8=A7=D9=84=D9=85=D8=AD=D9=85?= =?UTF-8?q?=D9=88=D8=AF=D9=8A=20=28Ahmed=20El-Mahmoudy=29?= Date: Thu, 29 May 2014 17:07:52 +0300 Subject: [PATCH 5/6] Add build for GnuCash 1.3.3 (29) --- metadata/org.gnucash.android.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/metadata/org.gnucash.android.txt b/metadata/org.gnucash.android.txt index 73e611a253..06044b789a 100644 --- a/metadata/org.gnucash.android.txt +++ b/metadata/org.gnucash.android.txt @@ -85,6 +85,11 @@ Build:1.3.2,28 subdir=app srclibs=1:ActionBarSherlock@4.4.0,2:ViewPagerIndicator@2.4.1 +Build:1.3.3,29 + commit=v1.3.3 + subdir=app + srclibs=1:ActionBarSherlock@4.4.0,2:ViewPagerIndicator@2.4.1 + Auto Update Mode:None Update Check Mode:Tags v[0-9.]*$ Current Version:1.3.3 From 8e156d8f5932884c21dfa05d0fbbb18dba5b8d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=A3=D8=AD=D9=85=D8=AF=20=D8=A7=D9=84=D9=85=D8=AD=D9=85?= =?UTF-8?q?=D9=88=D8=AF=D9=8A=20=28Ahmed=20El-Mahmoudy=29?= Date: Thu, 29 May 2014 17:15:02 +0300 Subject: [PATCH 6/6] Add builds for OpenWLANMap/Mini 1.11 (111) --- metadata/com.vwp.owmap.txt | 5 +++++ metadata/com.vwp.owmini.txt | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/metadata/com.vwp.owmap.txt b/metadata/com.vwp.owmap.txt index f8b384e06e..db586a2504 100644 --- a/metadata/com.vwp.owmap.txt +++ b/metadata/com.vwp.owmap.txt @@ -63,6 +63,11 @@ Build:1.10,110 subdir=master/android/OWMapAtAndroid prebuild=echo 'source.dir=src;../LocDemo/src/com/vwp/libwlocate' > ant.properties +Build:1.11,111 + commit=d2a864 + subdir=master/android/OWMapAtAndroid + prebuild=echo 'source.dir=src;../LocDemo/src/com/vwp/libwlocate' > ant.properties + Auto Update Mode:None Update Check Mode:RepoManifest Current Version:1.11 diff --git a/metadata/com.vwp.owmini.txt b/metadata/com.vwp.owmini.txt index b12117ae57..4f5b175134 100644 --- a/metadata/com.vwp.owmini.txt +++ b/metadata/com.vwp.owmini.txt @@ -49,6 +49,11 @@ Build:1.10,110 subdir=master/android/OWMiniAtAndroid prebuild=echo 'source.dir=src;../LocDemo/src/com/vwp/libwlocate' > ant.properties +Build:1.11,111 + commit=d2a864 + subdir=master/android/OWMiniAtAndroid + prebuild=echo 'source.dir=src;../LocDemo/src/com/vwp/libwlocate' > ant.properties + Auto Update Mode:None Update Check Mode:RepoManifest Current Version:1.11