Skip to content

Commit

Permalink
Merge branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
jmir1 committed Feb 13, 2023
2 parents 9d3dcb0 + c93dd99 commit a2afb04
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 16 deletions.
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.6.10'
ext.kotlin_version = '1.7.10'
repositories {
mavenCentral()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.1.0'
classpath 'com.android.tools.build:gradle:7.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
Expand All @@ -19,6 +19,7 @@ allprojects {
repositories {
mavenCentral()
google()
maven { url "https://jitpack.io" }
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
21 changes: 8 additions & 13 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ plugins {
}

android {
compileSdkVersion 29
compileSdkVersion 33

defaultConfig {
minSdkVersion 21
targetSdkVersion 29
versionCode 1
versionName '13'
targetSdkVersion 33
versionName '14'
}

buildTypes {
Expand All @@ -22,15 +21,11 @@ android {
}

dependencies {
compileOnly "com.squareup.okhttp3:okhttp:4.9.1"
compileOnly "io.reactivex:rxjava:1.3.8"
compileOnly "org.jsoup:jsoup:1.14.3"
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}

repositories {
mavenCentral()
google()
implementation "com.squareup.okhttp3:okhttp:5.0.0-alpha.11"
implementation "io.reactivex:rxjava:1.3.8"
implementation "io.reactivex:rxandroid:1.2.1"
implementation "org.jsoup:jsoup:1.15.3"
implementation "com.github.inorichi.injekt:injekt-core:65b0440"
}

task androidSourcesJar(type: Jar) {
Expand Down

0 comments on commit a2afb04

Please sign in to comment.