make OctoDroid FOSS again
Use patches instead of sed because otherwise we'd need annoying triple quoting.
This commit is contained in:
parent
162573f1f8
commit
f0c3f09494
|
@ -1,4 +1,4 @@
|
|||
AntiFeatures:UpstreamNonFree,NonFreeNet
|
||||
AntiFeatures:NonFreeNet
|
||||
Categories:Development
|
||||
License:Apache-2.0
|
||||
Web Site:http://slapperwan.github.io/gh4a/
|
||||
|
@ -22,9 +22,6 @@ Supports all the basic Github.com features, such as:
|
|||
Uses OAuth2: your password is used to generate a key and is then destroyed. The
|
||||
key can be revoked any time by visiting github.com. Formerly known as GH4A. This
|
||||
application is currently in BETA: please report any issues to the issue tracker.
|
||||
|
||||
Newer versions exist elsewhere, but now include proprietary libraries, so
|
||||
updates are unlikely here.
|
||||
.
|
||||
|
||||
Repo Type:git
|
||||
|
@ -81,7 +78,13 @@ Build:4.0.2,45
|
|||
commit=v4.0.2
|
||||
gradle=yes
|
||||
|
||||
Auto Update Mode:None
|
||||
Update Check Mode:Static
|
||||
Current Version:4.0.4
|
||||
Current Version Code:47
|
||||
Build:4.2.0,54
|
||||
commit=v4.2.0
|
||||
subdir=app
|
||||
patch=0001-remove-nonfree-dependencies.patch,0002-add-clientid-and-secret.patch
|
||||
gradle=foss
|
||||
|
||||
Auto Update Mode:Version v%v
|
||||
Update Check Mode:Tags
|
||||
Current Version:4.2.0
|
||||
Current Version Code:54
|
||||
|
|
52
metadata/com.gh4a/0001-remove-nonfree-dependencies.patch
Normal file
52
metadata/com.gh4a/0001-remove-nonfree-dependencies.patch
Normal file
|
@ -0,0 +1,52 @@
|
|||
From 1653aa3d4b235500219ca51727c271c2cbb485cc Mon Sep 17 00:00:00 2001
|
||||
From: Marcus Hoffmann <m.hoffmann@cartelsol.com>
|
||||
Date: Mon, 28 Aug 2017 23:24:55 +0200
|
||||
Subject: [PATCH 1/2] remove nonfree dependencies
|
||||
|
||||
---
|
||||
app/build.gradle | 7 -------
|
||||
1 file changed, 7 deletions(-)
|
||||
|
||||
diff --git a/app/build.gradle b/app/build.gradle
|
||||
index cf90f34e..5947b592 100644
|
||||
--- a/app/build.gradle
|
||||
+++ b/app/build.gradle
|
||||
@@ -3,17 +3,14 @@ def isPlaystore = taskRequests.contains("Playstore") || taskRequests.contains("p
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
- maven { url 'https://maven.fabric.io/public' }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
- classpath 'io.fabric.tools:gradle:1.+'
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
- maven { url 'https://maven.fabric.io/public' }
|
||||
maven { url "https://jitpack.io" }
|
||||
maven { url "https://maven.google.com" }
|
||||
}
|
||||
@@ -21,7 +18,6 @@ repositories {
|
||||
apply plugin: 'com.android.application'
|
||||
|
||||
if (isPlaystore) {
|
||||
- apply plugin: 'io.fabric'
|
||||
}
|
||||
|
||||
android {
|
||||
@@ -83,9 +79,6 @@ dependencies {
|
||||
exclude group: 'org.json', module : 'json'
|
||||
}
|
||||
compile 'com.github.Tunous:MarkdownEdit:0.1.1'
|
||||
- playstoreCompile('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
|
||||
- transitive = true;
|
||||
- }
|
||||
}
|
||||
|
||||
def Properties props = new Properties()
|
||||
--
|
||||
2.11.0
|
||||
|
27
metadata/com.gh4a/0002-add-clientid-and-secret.patch
Normal file
27
metadata/com.gh4a/0002-add-clientid-and-secret.patch
Normal file
|
@ -0,0 +1,27 @@
|
|||
From bbb04d0b0c5a698af272e4c002641ac22f0c2bc4 Mon Sep 17 00:00:00 2001
|
||||
From: Marcus Hoffmann <m.hoffmann@cartelsol.com>
|
||||
Date: Mon, 28 Aug 2017 23:25:18 +0200
|
||||
Subject: [PATCH 2/2] add clientid and secret
|
||||
|
||||
---
|
||||
app/build.gradle | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/app/build.gradle b/app/build.gradle
|
||||
index 5947b592..c0845589 100644
|
||||
--- a/app/build.gradle
|
||||
+++ b/app/build.gradle
|
||||
@@ -32,8 +32,8 @@ android {
|
||||
versionCode 54
|
||||
versionName "4.2.0"
|
||||
|
||||
- buildConfigField 'String', 'CLIENT_ID', ClientId
|
||||
- buildConfigField 'String', 'CLIENT_SECRET', ClientSecret
|
||||
+ buildConfigField 'String', 'CLIENT_ID', '"f0f32f2ee4a709ba3640"'
|
||||
+ buildConfigField 'String', 'CLIENT_SECRET', '"f94cffda88486696c2762ad986bc0b8b830c9cff"'
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
--
|
||||
2.11.0
|
||||
|
Loading…
Reference in a new issue