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

PIA-1239: Update dependencies #66

Merged
merged 1 commit into from
Jan 25, 2024
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
24 changes: 12 additions & 12 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
buildscript {
repositories {
google()
jcenter()
maven {
url "https://plugins.gradle.org/m2/"
}
}

dependencies {
Expand All @@ -17,23 +19,22 @@ apply plugin: 'kape.licenses'

repositories {
google()
jcenter()
mavenCentral()
mavenLocal()
maven { url "https://jitpack.io" }
}

dependencies {
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'androidx.test.uiautomator:uiautomator:2.2.0'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'

implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.preference:preference:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.preference:preference-ktx:1.2.1'
implementation 'com.madgag.spongycastle:core:1.58.0.0'
implementation 'com.google.android.material:material:1.1.0'
implementation 'androidx.appcompat:appcompat:1.2.0-alpha03'
implementation "androidx.core:core-ktx:1.3.0"
implementation 'com.google.android.material:material:1.11.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation "androidx.core:core-ktx:1.12.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
implementation 'com.google.code.gson:gson:2.10.1'
Expand All @@ -48,7 +49,7 @@ dependencies {

// Commons
implementation("com.kape.android:account-android:1.4.6")
implementation("com.kape.android:regions-android:1.6.4")
implementation("com.kape.android:regions-android:1.6.5")
implementation("com.kape.android:csi-android:1.3.2")
implementation("com.kape.android:kpi-android:1.2.2")

Expand All @@ -69,7 +70,7 @@ dependencies {


// EventBus
implementation 'org.greenrobot:eventbus:3.1.1'
implementation 'org.greenrobot:eventbus:3.3.1'

//ButterKnife
implementation 'com.jakewharton:butterknife:10.2.3'
Expand All @@ -84,9 +85,8 @@ dependencies {
implementation 'com.amazon.device:amazon-appstore-sdk:3.0.4'

//google
def billing_version = "5.2.1"
implementation "com.android.billingclient:billing:5.2.1"

implementation "com.android.billingclient:billing:$billing_version"
// https://github.com/jrummyapps/colorpicker
implementation 'com.jrummyapps:colorpicker:2.1.6'
//https://github.com/PhilJay/MPAndroidChart
Expand Down
8 changes: 6 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ buildscript {
ext.kotlin_version = '1.9.20'
repositories {
google()
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
maven {
url "https://plugins.gradle.org/m2/"
}
}

dependencies {
Expand All @@ -17,7 +19,6 @@ buildscript {
allprojects{
repositories {
google()
jcenter()
mavenCentral()
mavenLocal()
maven { url "https://jitpack.io" }
Expand All @@ -26,6 +27,9 @@ allprojects{
url 'https://maven.google.com/'
name 'Google'
}
maven {
url "https://plugins.gradle.org/m2/"
}
maven {
url = uri("https://maven.pkg.github.com/pia-foss/mobile-shared-regions")
credentials {
Expand Down
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-7.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
Loading