Skip to content

Commit cc07f06

Browse files
smareksmarek
committed
maven publishing working with gradle 5.2.1, snapshots published, raised minSdkVersion for sanity to API 14
1 parent b0b7806 commit cc07f06

File tree

7 files changed

+95
-23
lines changed

7 files changed

+95
-23
lines changed

‎build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ buildscript {
22
repositories {
33
google()
44
jcenter()
5+
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
56
}
67

78
dependencies {
89
classpath 'com.android.tools.build:gradle:3.4.1'
10+
classpath 'com.vanniktech:gradle-android-javadoc-plugin:0.4.0-SNAPSHOT'
11+
classpath 'digital.wup:android-maven-publish:3.6.2'
912
}
1013
}
1114

@@ -31,3 +34,4 @@ allprojects {
3134
}
3235

3336
apply plugin: 'android-reporting'
37+
apply plugin: 'com.vanniktech.android.javadoc'

‎library/build.gradle

Lines changed: 78 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
apply plugin: 'com.android.library'
2+
apply plugin: 'digital.wup.android-maven-publish'
3+
apply plugin: 'signing'
24

35
android {
46
compileSdkVersion 28
57
buildToolsVersion '28.0.3'
68

79
defaultConfig {
8-
minSdkVersion 3
10+
minSdkVersion 14
911
targetSdkVersion 28
1012
}
1113

@@ -26,3 +28,78 @@ android {
2628
dependencies {
2729
api 'cz.msebera.android:httpclient:4.5.8'
2830
}
31+
32+
project.afterEvaluate { project ->
33+
34+
android.libraryVariants.all { variant ->
35+
def name = variant.buildType.name
36+
def task = project.tasks.create "jar${name.capitalize()}", Jar
37+
task.dependsOn variant.javaCompileProvider.get()
38+
task.from variant.javaCompileProvider.get().destinationDir
39+
}
40+
41+
task sourcesJar(type: Jar) {
42+
from android.sourceSets.main.java.srcDirs
43+
archiveClassifier = 'sources'
44+
}
45+
46+
task javadocJar(type: Jar, dependsOn: tasks.findAll { task -> task.name.contains('Javadoc') }) {
47+
archiveClassifier = 'javadoc'
48+
from 'build/docs/javadoc/release/'
49+
}
50+
51+
publishing {
52+
publications {
53+
maven(MavenPublication) {
54+
artifactId = POM_ARTIFACT_ID
55+
artifact javadocJar
56+
artifact sourcesJar
57+
artifact jarRelease
58+
from components.android
59+
60+
pom {
61+
name = POM_NAME
62+
description = POM_DESCRIPTION
63+
packaging = POM_PACKAGING
64+
url = POM_URL
65+
66+
scm {
67+
connection = POM_SCM_CONNECTION
68+
developerConnection = POM_SCM_DEV_CONNECTION
69+
url = POM_SCM_URL
70+
}
71+
72+
licenses {
73+
license {
74+
name = POM_LICENCE_NAME
75+
url = POM_LICENCE_URL
76+
distribution = POM_LICENCE_DIST
77+
}
78+
}
79+
}
80+
81+
pom.name = POM_NAME
82+
pom.description = POM_DESCRIPTION
83+
pom.url = POM_URL
84+
pom.packaging = POM_PACKAGING
85+
}
86+
}
87+
repositories {
88+
maven {
89+
def releaseUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
90+
def snapshotUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
91+
url = version.endsWith('SNAPSHOT') ? snapshotUrl : releaseUrl
92+
credentials {
93+
username NEXUS_USERNAME
94+
password NEXUS_PASSWORD
95+
}
96+
}
97+
}
98+
}
99+
100+
signing {
101+
sign publishing.publications.maven
102+
}
103+
}
104+
105+

‎library/src/main/java/com/loopj/android/http/base64/Base64.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package com.loopj.android.http.base64;
1818

19-
import com.loopj.android.http.BuildConfig;
20-
2119
import java.io.UnsupportedEncodingException;
2220

2321
/**
@@ -229,7 +227,7 @@ private static byte[] encode(byte[] input, int offset, int len, int flags) {
229227
encoder.output = new byte[output_len];
230228
encoder.process(input, offset, len, true);
231229

232-
if (BuildConfig.DEBUG && encoder.op != output_len) {
230+
if (encoder.op != output_len) {
233231
throw new AssertionError();
234232
}
235233

@@ -691,7 +689,7 @@ public boolean process(byte[] input, int offset, int len, boolean finish) {
691689
output[op++] = '\n';
692690
}
693691

694-
if (BuildConfig.DEBUG && (tailLen != 0 || p != len)) {
692+
if ((tailLen != 0 || p != len)) {
695693
throw new AssertionError();
696694
}
697695
} else {

‎library/src/main/java/com/loopj/android/http/utils/LogHandler.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.loopj.android.http.utils;
22

3-
import android.annotation.TargetApi;
4-
import android.os.Build;
53
import android.util.Log;
64

75
import com.loopj.android.http.interfaces.LogInterface;
@@ -56,11 +54,7 @@ public void logWithThrowable(int logLevel, String tag, String msg, Throwable t)
5654
Log.d(tag, msg, t);
5755
break;
5856
case WTF:
59-
if (Build.VERSION.SDK_INT > 8) {
60-
checkedWtf(tag, msg, t);
61-
} else {
62-
Log.e(tag, msg, t);
63-
}
57+
Log.wtf(tag, msg, t);
6458
break;
6559
case INFO:
6660
Log.i(tag, msg, t);
@@ -69,11 +63,6 @@ public void logWithThrowable(int logLevel, String tag, String msg, Throwable t)
6963
}
7064
}
7165

72-
@TargetApi(Build.VERSION_CODES.FROYO)
73-
private void checkedWtf(String tag, String msg, Throwable t) {
74-
Log.wtf(tag, msg, t);
75-
}
76-
7766
@Override
7867
public void v(String tag, String msg) {
7968
log(VERBOSE, tag, msg);

‎library/src/main/java/com/loopj/android/http/utils/PersistentCookieStore.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void addCookie(Cookie cookie) {
9999
SharedPreferences.Editor prefsWriter = cookiePrefs.edit();
100100
prefsWriter.putString(COOKIE_NAME_STORE, TextUtils.join(",", cookies.keySet()));
101101
prefsWriter.putString(COOKIE_NAME_PREFIX + name, encodeCookie(new SerializableCookie(cookie)));
102-
prefsWriter.commit();
102+
prefsWriter.apply();
103103
}
104104

105105
@Override
@@ -110,7 +110,7 @@ public void clear() {
110110
prefsWriter.remove(COOKIE_NAME_PREFIX + name);
111111
}
112112
prefsWriter.remove(COOKIE_NAME_STORE);
113-
prefsWriter.commit();
113+
prefsWriter.apply();
114114

115115
// Clear cookies from local store
116116
cookies.clear();
@@ -140,7 +140,7 @@ public boolean clearExpired(Date date) {
140140
if (clearedAny) {
141141
prefsWriter.putString(COOKIE_NAME_STORE, TextUtils.join(",", cookies.keySet()));
142142
}
143-
prefsWriter.commit();
143+
prefsWriter.apply();
144144

145145
return clearedAny;
146146
}
@@ -170,7 +170,7 @@ public void deleteCookie(Cookie cookie) {
170170
cookies.remove(name);
171171
SharedPreferences.Editor prefsWriter = cookiePrefs.edit();
172172
prefsWriter.remove(COOKIE_NAME_PREFIX + name);
173-
prefsWriter.commit();
173+
prefsWriter.apply();
174174
}
175175

176176
/**

‎sample/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ android {
55
buildToolsVersion '28.0.3'
66

77
defaultConfig {
8-
minSdkVersion 3
8+
minSdkVersion 14
99
targetSdkVersion 28
1010
}
1111

@@ -39,5 +39,5 @@ android {
3939

4040
dependencies {
4141
implementation 'com.fasterxml.jackson.core:jackson-databind:2.5.3'
42-
implementation project(':library')
42+
implementation project(':android-async-http')
4343
}

‎settings.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
include ':library'
22
include ':sample'
3+
4+
rootProject.name = 'android-async-http-project'
5+
project(':library').name = 'android-async-http'
6+
project(':sample').name = 'android-async-http-sample'

0 commit comments

Comments
 (0)