Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #4

Merged
merged 5 commits into from
Dec 21, 2021
Merged
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
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.1'
classpath 'com.android.tools.build:gradle:7.0.3'
classpath 'com.novoda:bintray-release:0.9.1'
}
}
Expand All @@ -29,7 +29,7 @@ ext{

allprojects {
repositories {
jcenter()
mavenCentral()
google()
}

Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# org.gradle.parallel=true
android.useAndroidX=true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip
37 changes: 18 additions & 19 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ apply plugin: "com.android.library"
//apply plugin: 'bintray-release'

android {
compileSdkVersion 28
compileSdkVersion 30

defaultConfig {
minSdkVersion 15
targetSdkVersion 28
targetSdkVersion 30
versionCode VERSION_CODE
versionName VERSION_NAME

Expand All @@ -38,28 +38,27 @@ android {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')

api 'io.reactivex.rxjava2:rxjava:2.1.10'
api 'com.squareup.retrofit2:retrofit:2.5.0'
api 'io.reactivex.rxjava2:rxjava:2.2.21'
api 'com.squareup.retrofit2:retrofit:2.6.4'

implementation 'com.android.support:support-annotations:28.0.0'
implementation 'com.squareup.retrofit2:converter-moshi:2.5.0'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.5.0'
implementation 'com.squareup.okhttp3:logging-interceptor:3.6.0'
implementation 'com.squareup.moshi:moshi:1.8.0'
implementation 'com.squareup.moshi:moshi-adapters:1.8.0'
implementation 'androidx.annotation:annotation:1.3.0'
implementation 'com.squareup.retrofit2:converter-moshi:2.6.4'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.6.4'
implementation 'com.squareup.okhttp3:logging-interceptor:3.12.13'
implementation 'com.squareup.moshi:moshi:1.12.0'
implementation 'com.squareup.moshi:moshi-adapters:1.12.0'

compileOnly 'com.ryanharter.auto.value:auto-value-moshi-annotations:0.4.7'
annotationProcessor 'com.ryanharter.auto.value:auto-value-moshi:0.4.7'
annotationProcessor "com.ryanharter.auto.value:auto-value-moshi-extension:1.1.0"
implementation "com.ryanharter.auto.value:auto-value-moshi-runtime:1.1.0"
annotationProcessor "com.ryanharter.auto.value:auto-value-moshi-factory:1.1.0"

compileOnly 'com.google.auto.value:auto-value-annotations:1.6.6'
annotationProcessor 'com.google.auto.value:auto-value:1.6.6'
compileOnly 'com.google.auto.value:auto-value-annotations:1.7'
annotationProcessor 'com.google.auto.value:auto-value:1.7'

implementation 'com.ryanharter.auto.value:auto-value-parcel-adapter:0.2.8'
annotationProcessor 'com.ryanharter.auto.value:auto-value-parcel:0.2.8'
implementation 'com.ryanharter.auto.value:auto-value-parcel-adapter:0.2.9'
annotationProcessor 'com.ryanharter.auto.value:auto-value-parcel:0.2.9'

androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
testImplementation 'junit:junit:4.12'
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.core;

import android.net.Uri;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.text.TextUtils;

import java.io.Closeable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.google.auto.value.AutoValue;
import com.squareup.moshi.Json;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.google.auto.value.AutoValue;
import com.meisolsson.githubsdk.core.FormattedTime;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.google.auto.value.AutoValue;
import com.squareup.moshi.Json;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.meisolsson.githubsdk.core.FormattedTime;
import com.google.auto.value.AutoValue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.meisolsson.githubsdk.model.git.GitCommit;
import com.google.auto.value.AutoValue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.google.auto.value.AutoValue;
import com.squareup.moshi.Json;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.google.auto.value.AutoValue;
import com.squareup.moshi.Json;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.meisolsson.githubsdk.model.git.GitCommit;
import com.google.auto.value.AutoValue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.meisolsson.githubsdk.core.FormattedTime;
import com.google.auto.value.AutoValue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.meisolsson.githubsdk.core.FormattedTime;
import com.google.auto.value.AutoValue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.meisolsson.githubsdk.core.FormattedTime;
import com.google.auto.value.AutoValue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.google.auto.value.AutoValue;
import com.meisolsson.githubsdk.core.FormattedTime;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.google.auto.value.AutoValue;
import com.squareup.moshi.JsonAdapter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.meisolsson.githubsdk.core.FormattedTime;
import com.google.auto.value.AutoValue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.google.auto.value.AutoValue;
import com.squareup.moshi.Json;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.meisolsson.githubsdk.core.FormattedTime;
import com.google.auto.value.AutoValue;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.google.auto.value.AutoValue;
import com.meisolsson.githubsdk.core.FormattedTime;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.meisolsson.githubsdk.model;

import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.google.auto.value.AutoValue;
import com.squareup.moshi.Json;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.meisolsson.githubsdk.core.FormattedHtml;
import com.meisolsson.githubsdk.core.FormattedTime;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.meisolsson.githubsdk.core.FormattedTime;
import com.meisolsson.githubsdk.core.GitHubPayloadTypeAdapter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.google.auto.value.AutoValue;
import com.squareup.moshi.Json;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.google.auto.value.AutoValue;
import com.squareup.moshi.JsonAdapter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.google.auto.value.AutoValue;
import com.squareup.moshi.Json;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.google.auto.value.AutoValue;
import com.squareup.moshi.Json;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.meisolsson.githubsdk.core.FormattedHtml;
import com.meisolsson.githubsdk.core.FormattedTime;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.meisolsson.githubsdk.core.FormattedTime;
import com.google.auto.value.AutoValue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.google.auto.value.AutoValue;
import com.squareup.moshi.JsonAdapter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.google.auto.value.AutoValue;
import com.squareup.moshi.Json;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.google.auto.value.AutoValue;
import com.squareup.moshi.Json;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.meisolsson.githubsdk.core.FormattedTime;
import com.google.auto.value.AutoValue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.google.auto.value.AutoValue;
import com.squareup.moshi.Json;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.meisolsson.githubsdk.model;

import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.meisolsson.githubsdk.core.FormattedTime;
import com.google.auto.value.AutoValue;
Expand Down
Loading