Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions android-networking/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ android {
versionCode 1
versionName "1.0"
consumerProguardFiles 'proguard-rules.pro'
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
Expand All @@ -40,11 +41,11 @@ 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"
api "com.android.support:appcompat-v7:$rootProject.ext.supportAppCompatVersion"
}
//apply from: 'upload.gradle'
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public interface Logger {
Logger DEFAULT = new Logger() {
@Override
public void log(String message) {
Platform.get().log(INFO, message, null);
Platform.get().log(message, INFO, null);
}
};
}
Expand Down
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
24 changes: 12 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -44,20 +44,20 @@ task clean(type: Delete) {

ext {
// App tools version
compileSdkVersion = 27
compileSdkVersion = 29
minSdkVersion = 14
targetSdkVersion = 27
buildToolsVersion = "27.0.3"
targetSdkVersion = 29
buildToolsVersion = "29.0.2"

// App dependencies versions
okHttp3Version = "3.10.0"
gsonVersion = "2.8.2"
jacksonVersion = "2.8.2"
okHttp3Version = "4.7.2"
gsonVersion = "2.8.6"
jacksonVersion = "2.12.0"
rxJavaVersion = "1.3.8"
rxJavaAndroidVersion = "1.2.1"
rxJava2Version = "2.1.12"
rxJava2AndroidVersion = "2.0.2"
jUnitVersion = "4.12"
mockWebServerVersion = "3.10.0"
supportAppCompatVersion = "27.1.1"
}
jUnitVersion = "4.13.2"
mockWebServerVersion = "3.12.0"
supportAppCompatVersion = "28.0.0"
}
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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-6.7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
72 changes: 42 additions & 30 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

174 changes: 84 additions & 90 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading