Skip to content

Commit 421c872

Browse files
committed
fixed bug in library and changed group id
1 parent 4651356 commit 421c872

File tree

18 files changed

+21
-21
lines changed

18 files changed

+21
-21
lines changed

app/app.iml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@
6666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
6767
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6868
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
69-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7169
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
7270
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.1/jars" />
7371
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
@@ -78,7 +76,6 @@
7876
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
7977
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8078
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8279
</content>
8380
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
8481
<orderEntry type="sourceFolder" forTests="false" />

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ android {
55
buildToolsVersion "23.0.2"
66

77
defaultConfig {
8-
applicationId "com.door43.gogsclient"
8+
applicationId "org.unfoldingword.gogsclient"
99
minSdkVersion 15
1010
targetSdkVersion 23
1111
versionCode 1

app/src/androidTest/java/com/door43/gogsclient/ApplicationTest.java renamed to app/src/androidTest/java/org/unfoldingword/gogsclient/ApplicationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.door43.gogsclient;
1+
package org.unfoldingword.gogsclient;
22

33
import android.app.Application;
44
import android.test.ApplicationTestCase;

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.door43.gogsclient">
3+
package="org.unfoldingword.gogsclient">
44

55
<!-- To auto-complete the email text field in the login form with the user's emails -->
66
<uses-permission android:name="android.permission.GET_ACCOUNTS" />

app/src/main/java/com/door43/gogsclient/LoginActivity.java renamed to app/src/main/java/org/unfoldingword/gogsclient/LoginActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.door43.gogsclient;
1+
package org.unfoldingword.gogsclient;
22

33
import android.animation.Animator;
44
import android.animation.AnimatorListenerAdapter;

app/src/main/res/layout/activity_login.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
android:paddingLeft="@dimen/activity_horizontal_margin"
99
android:paddingRight="@dimen/activity_horizontal_margin"
1010
android:paddingTop="@dimen/activity_vertical_margin"
11-
tools:context="com.door43.gogsclient.LoginActivity">
11+
tools:context="org.unfoldingword.gogsclient.LoginActivity">
1212

1313
<!-- Login progress -->
1414
<ProgressBar

app/src/test/java/com/door43/gogsclient/ExampleUnitTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.door43.gogsclient;
1+
package org.unfoldingword.gogsclient;
22

33
import org.junit.Test;
44

gogs-client/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ext {
44
bintrayRepo = 'maven'
55
bintrayName = 'gogs-client'
66

7-
publishedGroupId = 'com.unfoldingword.tools'
7+
publishedGroupId = 'org.unfoldingword.tools'
88
libraryName = 'Gogs Client'
99
artifact = 'gogs-client'
1010

gogs-client/gogs-client.iml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":gogs-client" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="android-gogs-client" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":gogs-client" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="org.unfoldingword.tools" external.system.module.version="1.0.0" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -74,6 +74,7 @@
7474
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7575
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7676
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
7778
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
7879
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
7980
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />

gogs-client/src/androidTest/java/com/door43/gogsclient/ApplicationTest.java renamed to gogs-client/src/androidTest/java/org/unfoldingword/gogsclient/ApplicationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.door43.gogsclient;
1+
package org.unfoldingword.gogsclient;
22

33
import android.app.Application;
44
import android.test.ApplicationTestCase;

gogs-client/src/main/AndroidManifest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.door43.gogsclient">
2+
package="org.unfoldingword.gogsclient">
3+
4+
<uses-permission android:name="android.permission.INTERNET" />
35

46
<application
57
android:allowBackup="true"

gogs-client/src/main/java/com/door43/gogsclient/GogsAPI.java renamed to gogs-client/src/main/java/org/unfoldingword/gogsclient/GogsAPI.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.door43.gogsclient;
1+
package org.unfoldingword.gogsclient;
22

33
import android.util.Base64;
44

@@ -28,7 +28,7 @@ public class GogsAPI {
2828
private Response lastResponse = null;
2929

3030
public GogsAPI(String baseUrl) {
31-
this.baseUrl = baseUrl.replaceAll("/+$", "/");
31+
this.baseUrl = baseUrl.replaceAll("/+$", "") + "/";
3232
}
3333

3434
/**

gogs-client/src/main/java/com/door43/gogsclient/PublicKey.java renamed to gogs-client/src/main/java/org/unfoldingword/gogsclient/PublicKey.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.door43.gogsclient;
1+
package org.unfoldingword.gogsclient;
22

33
import org.json.JSONException;
44
import org.json.JSONObject;

gogs-client/src/main/java/com/door43/gogsclient/Repository.java renamed to gogs-client/src/main/java/org/unfoldingword/gogsclient/Repository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.door43.gogsclient;
1+
package org.unfoldingword.gogsclient;
22

33
import org.json.JSONException;
44
import org.json.JSONObject;

gogs-client/src/main/java/com/door43/gogsclient/Response.java renamed to gogs-client/src/main/java/org/unfoldingword/gogsclient/Response.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.door43.gogsclient;
1+
package org.unfoldingword.gogsclient;
22

33
/**
44
* Holds the response from the api

gogs-client/src/main/java/com/door43/gogsclient/Token.java renamed to gogs-client/src/main/java/org/unfoldingword/gogsclient/Token.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.door43.gogsclient;
1+
package org.unfoldingword.gogsclient;
22

33
import org.json.JSONException;
44
import org.json.JSONObject;

gogs-client/src/main/java/com/door43/gogsclient/User.java renamed to gogs-client/src/main/java/org/unfoldingword/gogsclient/User.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.door43.gogsclient;
1+
package org.unfoldingword.gogsclient;
22

33
import org.json.JSONException;
44
import org.json.JSONObject;

gogs-client/src/test/java/com/door43/gogsclient/ExampleUnitTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.door43.gogsclient;
1+
package org.unfoldingword.gogsclient;
22

33
import org.junit.Test;
44

0 commit comments

Comments
 (0)