diff --git a/README.md b/README.md index 59db6612..20ce0ca4 100644 --- a/README.md +++ b/README.md @@ -60,12 +60,12 @@ maven { setUrl("https://jitpack.io") } Add this in your `build.gradle` ```groovy -implementation 'com.github.amitshekhariitbhu.Fast-Android-Networking:android-networking:1.0.3' +implementation 'com.github.amitshekhariitbhu.Fast-Android-Networking:android-networking:1.0.4' ``` If you are using `build.gradle.kts`, add the following: ```kotlin -implementation("com.github.amitshekhariitbhu.Fast-Android-Networking:android-networking:1.0.3") +implementation("com.github.amitshekhariitbhu.Fast-Android-Networking:android-networking:1.0.4") ``` Do not forget to add internet permission in manifest if already not present @@ -89,12 +89,12 @@ Using the Fast Android Networking with Jackson Parser Add this in your `build.gradle` ```groovy -implementation 'com.github.amitshekhariitbhu.Fast-Android-Networking:jackson-android-networking:1.0.3' +implementation 'com.github.amitshekhariitbhu.Fast-Android-Networking:jackson-android-networking:1.0.4' ``` If you are using `build.gradle.kts`, add the following: ```kotlin -implementation("com.github.amitshekhariitbhu.Fast-Android-Networking:jackson-android-networking:1.0.3") +implementation("com.github.amitshekhariitbhu.Fast-Android-Networking:jackson-android-networking:1.0.4") ``` ```java diff --git a/android-networking/build.gradle b/android-networking/build.gradle index e6a08f9b..37fc5cdf 100644 --- a/android-networking/build.gradle +++ b/android-networking/build.gradle @@ -40,11 +40,10 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile "junit:junit:$rootProject.ext.jUnitVersion" - androidTestCompile "com.squareup.okhttp3:mockwebserver:$rootProject.ext.mockWebServerVersion" - compile "com.squareup.okhttp3:okhttp:$rootProject.ext.okHttp3Version" - compile "com.google.code.gson:gson:$rootProject.ext.gsonVersion" - compile "com.android.support:appcompat-v7:$rootProject.ext.supportAppCompatVersion" + api fileTree(dir: 'libs', include: ['*.jar']) + testImplementation "junit:junit:$rootProject.ext.jUnitVersion" + androidTestImplementation "com.squareup.okhttp3:mockwebserver:$rootProject.ext.mockWebServerVersion" + api "com.squareup.okhttp3:okhttp:$rootProject.ext.okHttp3Version" + api "com.google.code.gson:gson:$rootProject.ext.gsonVersion" + implementation "com.android.support:appcompat-v7:$rootProject.ext.supportAppCompatVersion" } -//apply from: 'upload.gradle' diff --git a/android-networking/upload.gradle b/android-networking/upload.gradle deleted file mode 100755 index 0dbf33fe..00000000 --- a/android-networking/upload.gradle +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (C) 2016 Amit Shekhar - * Copyright (C) 2011 Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -apply plugin: 'com.github.dcendents.android-maven' -apply plugin: "com.jfrog.bintray" - -def siteUrl = 'https://github.com/amitshekhariitbhu/Fast-Android-Networking' -def gitUrl = 'https://github.com/amitshekhariitbhu/Fast-Android-Networking.git' - -group = "com.amitshekhar.android" -version = '1.0.2' - -install { - repositories.mavenInstaller { - pom.project { - packaging 'aar' - - name 'Fast Android Networking' - description 'Fast Android Networking is a powerful library for doing any type of networking in Android applications' - - url siteUrl - - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - - developers { - developer { - id 'amitshekhariitbhu' - name 'Amit Shekhar' - email 'amit.shekhar.iitbhu@gmail.com' - } - } - - scm { - connection gitUrl - developerConnection gitUrl - url siteUrl - } - } - } -} - -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' -} - -task javadoc(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - classpath += configurations.compile -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} -artifacts { - archives javadocJar - archives sourcesJar -} - -if (project.rootProject.file("local.properties").exists()) { - Properties properties = new Properties() - properties.load(project.rootProject.file('local.properties').newDataInputStream()) - - bintray { - user = properties.getProperty("bintray.user") - key = properties.getProperty("bintray.apikey") - - configurations = ['archives'] - dryRun = false - - pkg { - repo = "maven" - name = "android-networking" - websiteUrl = siteUrl - vcsUrl = gitUrl - licenses = ["Apache-2.0"] - publish = true - } - } -} diff --git a/app/build.gradle b/app/build.gradle index e2a4b59e..b38454ed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,8 +37,8 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile "junit:junit:$rootProject.ext.jUnitVersion" - compile "com.android.support:appcompat-v7:$rootProject.ext.supportAppCompatVersion" - compile project(':android-networking') + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation "junit:junit:$rootProject.ext.jUnitVersion" + implementation "com.android.support:appcompat-v7:$rootProject.ext.supportAppCompatVersion" + implementation project(':android-networking') } diff --git a/build.gradle b/build.gradle index b5ef45fe..ba78e1b6 100644 --- a/build.gradle +++ b/build.gradle @@ -23,9 +23,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.0' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' + classpath 'com.android.tools.build:gradle:7.0.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b3113037..ffed3a25 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Thu Apr 12 21:48:48 IST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/jackson-android-networking/build.gradle b/jackson-android-networking/build.gradle index 7e75d80f..fae7e674 100644 --- a/jackson-android-networking/build.gradle +++ b/jackson-android-networking/build.gradle @@ -50,11 +50,9 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile "junit:junit:$rootProject.ext.jUnitVersion" - androidTestCompile "com.squareup.okhttp3:mockwebserver:$rootProject.ext.mockWebServerVersion" - compile "com.fasterxml.jackson.core:jackson-databind:$rootProject.ext.jacksonVersion" - compile project(':android-networking') + api fileTree(dir: 'libs', include: ['*.jar']) + testImplementation "junit:junit:$rootProject.ext.jUnitVersion" + androidTestImplementation "com.squareup.okhttp3:mockwebserver:$rootProject.ext.mockWebServerVersion" + api "com.fasterxml.jackson.core:jackson-databind:$rootProject.ext.jacksonVersion" + api project(':android-networking') } - -//apply from: 'jackson-upload.gradle' diff --git a/jackson-android-networking/jackson-upload.gradle b/jackson-android-networking/jackson-upload.gradle deleted file mode 100755 index 34df92f3..00000000 --- a/jackson-android-networking/jackson-upload.gradle +++ /dev/null @@ -1,103 +0,0 @@ -/* - * - * * Copyright (C) 2016 Amit Shekhar - * * Copyright (C) 2011 Android Open Source Project - * * - * * Licensed under the Apache License, Version 2.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * * - * * http://www.apache.org/licenses/LICENSE-2.0 - * * - * * Unless required by applicable law or agreed to in writing, software - * * distributed under the License is distributed on an "AS IS" BASIS, - * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * * See the License for the specific language governing permissions and - * * limitations under the License. - * - */ - -apply plugin: 'com.github.dcendents.android-maven' -apply plugin: "com.jfrog.bintray" - -def siteUrl = 'https://github.com/amitshekhariitbhu/Fast-Android-Networking' -def gitUrl = 'https://github.com/amitshekhariitbhu/Fast-Android-Networking.git' - -group = "com.amitshekhar.android" -version = '1.0.2' - -install { - repositories.mavenInstaller { - pom.project { - packaging 'aar' - - name 'Fast Android Networking' - description 'Fast Android Networking is a powerful library for doing any type of networking in Android applications' - - url siteUrl - - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - - developers { - developer { - id 'amitshekhariitbhu' - name 'Amit Shekhar' - email 'amit.shekhar.iitbhu@gmail.com' - } - } - - scm { - connection gitUrl - developerConnection gitUrl - url siteUrl - } - } - } -} - -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' -} - -task javadoc(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - classpath += configurations.compile -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} -artifacts { - archives javadocJar - archives sourcesJar -} - -if (project.rootProject.file("local.properties").exists()) { - Properties properties = new Properties() - properties.load(project.rootProject.file('local.properties').newDataInputStream()) - - bintray { - user = properties.getProperty("bintray.user") - key = properties.getProperty("bintray.apikey") - - configurations = ['archives'] - dryRun = false - - pkg { - repo = "maven" - name = "jackson-android-networking" - websiteUrl = siteUrl - vcsUrl = gitUrl - licenses = ["Apache-2.0"] - publish = true - } - } -} diff --git a/rx-android-networking/build.gradle b/rx-android-networking/build.gradle index a8581b9a..2150f1b5 100644 --- a/rx-android-networking/build.gradle +++ b/rx-android-networking/build.gradle @@ -36,10 +36,9 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile "junit:junit:$rootProject.ext.jUnitVersion" - compile "io.reactivex:rxandroid:$rootProject.ext.rxJavaAndroidVersion" - compile "io.reactivex:rxjava:$rootProject.ext.rxJavaVersion" - compile project(':android-networking') + api fileTree(dir: 'libs', include: ['*.jar']) + testImplementation "junit:junit:$rootProject.ext.jUnitVersion" + api "io.reactivex:rxandroid:$rootProject.ext.rxJavaAndroidVersion" + api "io.reactivex:rxjava:$rootProject.ext.rxJavaVersion" + api project(':android-networking') } -//apply from: 'rx-upload.gradle' diff --git a/rx-android-networking/rx-upload.gradle b/rx-android-networking/rx-upload.gradle deleted file mode 100755 index c4fd5c45..00000000 --- a/rx-android-networking/rx-upload.gradle +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (C) 2016 Amit Shekhar - * Copyright (C) 2011 Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -apply plugin: 'com.github.dcendents.android-maven' -apply plugin: "com.jfrog.bintray" - -def siteUrl = 'https://github.com/amitshekhariitbhu/Fast-Android-Networking' -def gitUrl = 'https://github.com/amitshekhariitbhu/Fast-Android-Networking.git' - -group = "com.amitshekhar.android" -version = '1.0.2' - -install { - repositories.mavenInstaller { - pom.project { - packaging 'aar' - - name 'Fast Android Networking' - description 'Fast Android Networking is a powerful library for doing any type of networking in Android applications' - - url siteUrl - - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - - developers { - developer { - id 'amitshekhariitbhu' - name 'Amit Shekhar' - email 'amit.shekhar.iitbhu@gmail.com' - } - } - - scm { - connection gitUrl - developerConnection gitUrl - url siteUrl - } - } - } -} - -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' -} - -task javadoc(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - classpath += configurations.compile -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} -artifacts { - archives javadocJar - archives sourcesJar -} - -if (project.rootProject.file("local.properties").exists()) { - Properties properties = new Properties() - properties.load(project.rootProject.file('local.properties').newDataInputStream()) - - bintray { - user = properties.getProperty("bintray.user") - key = properties.getProperty("bintray.apikey") - - configurations = ['archives'] - dryRun = false - - pkg { - repo = "maven" - name = "rx-android-networking" - websiteUrl = siteUrl - vcsUrl = gitUrl - licenses = ["Apache-2.0"] - publish = true - } - } -} diff --git a/rx2-android-networking/build.gradle b/rx2-android-networking/build.gradle index 24dd65ec..122023ca 100644 --- a/rx2-android-networking/build.gradle +++ b/rx2-android-networking/build.gradle @@ -38,11 +38,10 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile "junit:junit:$rootProject.ext.jUnitVersion" - androidTestCompile "com.squareup.okhttp3:mockwebserver:$rootProject.ext.mockWebServerVersion" - compile "io.reactivex.rxjava2:rxandroid:$rootProject.ext.rxJava2AndroidVersion" - compile "io.reactivex.rxjava2:rxjava:$rootProject.ext.rxJava2Version" - compile project(':android-networking') -} -//apply from: 'rx2-upload.gradle' + api fileTree(dir: 'libs', include: ['*.jar']) + testImplementation "junit:junit:$rootProject.ext.jUnitVersion" + androidTestImplementation "com.squareup.okhttp3:mockwebserver:$rootProject.ext.mockWebServerVersion" + api "io.reactivex.rxjava2:rxandroid:$rootProject.ext.rxJava2AndroidVersion" + api "io.reactivex.rxjava2:rxjava:$rootProject.ext.rxJava2Version" + api project(':android-networking') +} \ No newline at end of file diff --git a/rx2-android-networking/rx2-upload.gradle b/rx2-android-networking/rx2-upload.gradle deleted file mode 100755 index bd5fb3f7..00000000 --- a/rx2-android-networking/rx2-upload.gradle +++ /dev/null @@ -1,103 +0,0 @@ -/* - * - * * Copyright (C) 2016 Amit Shekhar - * * Copyright (C) 2011 Android Open Source Project - * * - * * Licensed under the Apache License, Version 2.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * * - * * http://www.apache.org/licenses/LICENSE-2.0 - * * - * * Unless required by applicable law or agreed to in writing, software - * * distributed under the License is distributed on an "AS IS" BASIS, - * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * * See the License for the specific language governing permissions and - * * limitations under the License. - * - */ - -apply plugin: 'com.github.dcendents.android-maven' -apply plugin: "com.jfrog.bintray" - -def siteUrl = 'https://github.com/amitshekhariitbhu/Fast-Android-Networking' -def gitUrl = 'https://github.com/amitshekhariitbhu/Fast-Android-Networking.git' - -group = "com.amitshekhar.android" -version = '1.0.2' - -install { - repositories.mavenInstaller { - pom.project { - packaging 'aar' - - name 'Fast Android Networking' - description 'Fast Android Networking is a powerful library for doing any type of networking in Android applications' - - url siteUrl - - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - - developers { - developer { - id 'amitshekhariitbhu' - name 'Amit Shekhar' - email 'amit.shekhar.iitbhu@gmail.com' - } - } - - scm { - connection gitUrl - developerConnection gitUrl - url siteUrl - } - } - } -} - -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' -} - -task javadoc(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - classpath += configurations.compile -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} -artifacts { - archives javadocJar - archives sourcesJar -} - -if (project.rootProject.file("local.properties").exists()) { - Properties properties = new Properties() - properties.load(project.rootProject.file('local.properties').newDataInputStream()) - - bintray { - user = properties.getProperty("bintray.user") - key = properties.getProperty("bintray.apikey") - - configurations = ['archives'] - dryRun = false - - pkg { - repo = "maven" - name = "rx2-android-networking" - websiteUrl = siteUrl - vcsUrl = gitUrl - licenses = ["Apache-2.0"] - publish = true - } - } -} diff --git a/rx2sampleapp/build.gradle b/rx2sampleapp/build.gradle index 1c38a203..054e0dba 100644 --- a/rx2sampleapp/build.gradle +++ b/rx2sampleapp/build.gradle @@ -42,11 +42,11 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile "com.android.support:appcompat-v7:$rootProject.ext.supportAppCompatVersion" - testCompile "junit:junit:$rootProject.ext.jUnitVersion" - compile project(':rx2-android-networking') + implementation "com.android.support:appcompat-v7:$rootProject.ext.supportAppCompatVersion" + testImplementation "junit:junit:$rootProject.ext.jUnitVersion" + implementation project(':rx2-android-networking') } diff --git a/rxsampleapp/build.gradle b/rxsampleapp/build.gradle index 9a99639e..146b9ab2 100644 --- a/rxsampleapp/build.gradle +++ b/rxsampleapp/build.gradle @@ -37,8 +37,8 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile "junit:junit:$rootProject.ext.jUnitVersion" - compile "com.android.support:appcompat-v7:$rootProject.ext.supportAppCompatVersion" - compile project(':rx-android-networking') + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation "junit:junit:$rootProject.ext.jUnitVersion" + implementation "com.android.support:appcompat-v7:$rootProject.ext.supportAppCompatVersion" + implementation project(':rx-android-networking') }