Merge branch 'OctoDroid' into 'master'

Update OctoDroid

This finally builds against source code of GitHub API.
Yet it still pulls ViewPagerIndicator from http://dl.bintray.com:80/populov/maven/ repository, but I don't see what's the problem with that, since that repository contains the source too.

See merge request !604
This commit is contained in:
Boris Kraut 2015-03-20 22:41:28 +00:00
commit 5e86e1c87e
4 changed files with 95 additions and 4 deletions

View file

@ -25,6 +25,8 @@ report any issues to the issue tracker.
Newer versions exist elsewhere, but now include proprietary libraries, Newer versions exist elsewhere, but now include proprietary libraries,
so updates are unlikely here. so updates are unlikely here.
[https://github.com/slapperwan/gh4a/blob/master/CHANGES CHANGES]
. .
Repo Type:git Repo Type:git
@ -36,8 +38,17 @@ Build:3.6,36
gradle=yes gradle=yes
prebuild=rm -rf libs/android-support-v4.jar prebuild=rm -rf libs/android-support-v4.jar
Auto Update Mode:None Build:3.7.1,38
Update Check Mode:Static commit=v3.7.1
Current Version:3.6 patch=mint.patch,gradle.patch
Current Version Code:36 gradle=yes
srclibs=GH4AGitHubAPI@3d1878bd48d9aa3817a91b5a193b600c31e0406
prebuild=rm -rf libs/*.jar && \
cp -a $$GH4AGitHubAPI$$/src/org src
Auto Update Mode:None
Update Check Mode:Tags
Current Version:3.7.1
Current Version Code:38

View file

@ -0,0 +1,30 @@
diff --git a/build.gradle b/build.gradle
index 7e2eff9..75b7624 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
+ classpath 'com.android.tools.build:gradle:1.0.0'
}
}
@@ -37,16 +26,6 @@ android {
versionName "3.7.1"
}
- buildTypes {
- debug {
- zipAlign true
- }
- release {
- zipAlign true
- signingConfig signingConfigs.playStore
- }
- }
-
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'

View file

@ -0,0 +1,45 @@
diff --git a/build.gradle b/build.gradle
index 7e2eff9..39eed52 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,9 +10,6 @@ buildscript {
repositories {
maven { url 'http://dl.bintray.com/populov/maven' }
- /* The MINT jar should be present at this repo according
- to the docs, but it gives a 404 error
- maven { url "http://mint.splunk.com/gradle/" } */
maven { url 'https://github.com/kageiit/maven-repo/raw/master' }
mavenCentral()
}
@@ -60,8 +57,6 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: '*.jar')
- /* see above
- compile "com.splunk.mint:mint:4.0" */
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 245445e..e2da520 100644
--- a/src/com/gh4a/Gh4Application.java
+++ b/src/com/gh4a/Gh4Application.java
@@ -46,7 +46,6 @@ import android.content.res.Configuration;
import android.graphics.Typeface;
import com.gh4a.activities.SettingsActivity;
-import com.splunk.mint.Mint;
/**
* The Class Gh4Application.
@@ -97,9 +96,6 @@ public class Gh4Application extends Application implements OnSharedPreferenceCha
selectTheme(prefs.getInt(SettingsActivity.KEY_THEME, Constants.Theme.DARK));
prefs.registerOnSharedPreferenceChangeListener(this);
- Mint.disableNetworkMonitoring();
- Mint.initAndStartSession(this, "1e6a83ae");
-
mPt = new PrettyTime();
mClient = new DefaultClient();

View file

@ -0,0 +1,5 @@
Repo Type:git
Repo:https://github.com/slapperwan/egit-github.git
Subdir:org.eclipse.egit.github.core