Skip to content

Commit

Permalink
Merge pull request #506 from vimeo/tech/dependency-updates
Browse files Browse the repository at this point in the history
[TECH] Dependency Updates
  • Loading branch information
WhosNickDoglio authored Aug 10, 2021
2 parents 2cdb737 + f0c2a3a commit d85df78
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 79 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/shipit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,20 @@ jobs:
steps:
- uses: actions/[email protected]
- name: Cache
uses: actions/[email protected].3
uses: actions/[email protected].6
with:
path: |
"$HOME/.gradle/caches/"
"$HOME/.gradle/wrapper/"
"$HOME/.android/build-cache"
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
- name: set up JDK 1.8
uses: actions/setup-java@v1.4.3
- name: set up JDK 11
uses: actions/setup-java@v2.2.0
with:
java-version: 1.8
distribution: 'adopt'
java-version: '11'
- name: Install Ruby
uses: ruby/setup-ruby@v1.52.0
uses: ruby/setup-ruby@v1.81.0
with:
ruby-version: 2.6.3
bundler-cache: true
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,20 @@ jobs:
steps:
- uses: actions/[email protected]
- name: Cache
uses: actions/[email protected].3
uses: actions/[email protected].6
with:
path: |
"$HOME/.gradle/caches/"
"$HOME/.gradle/wrapper/"
"$HOME/.android/build-cache"
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
- name: set up JDK 1.8
uses: actions/setup-java@v1.4.3
- name: set up JDK 11
uses: actions/setup-java@v2.2.0
with:
java-version: 1.8
distribution: 'adopt'
java-version: '11'
- name: Install Ruby
uses: ruby/setup-ruby@v1.52.0
uses: ruby/setup-ruby@v1.81.0
with:
ruby-version: 2.6.3
bundler-cache: true
Expand Down
4 changes: 0 additions & 4 deletions api-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ apply plugin: 'java-library'
apply plugin: 'kotlin'
apply from: '../publish.gradle'

repositories {
jcenter()
}

dependencies {
compileOnly project(':models')

Expand Down
4 changes: 0 additions & 4 deletions auth/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ apply plugin: 'java-library'
apply plugin: 'kotlin'
apply from: '../publish.gradle'

repositories {
jcenter()
}

dependencies {
api project(':api-core')
compileOnly project(':models')
Expand Down
8 changes: 3 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ buildscript {
repositories {
google()
mavenCentral()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.android.tools.build:gradle:7.0.0'
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
Expand All @@ -24,9 +23,9 @@ ext {
stagVersion = '2.6.0'
junitVersion = '4.13.2'
buildToolsVersion = '29.0.3'
classgraphVersion = '4.8.110'
classgraphVersion = '4.8.111'
assertJVersion = '3.20.2'
robolectricVersion = "4.5.1"
robolectricVersion = "4.6.1"
podamVersion = "7.2.7.RELEASE"
}

Expand Down Expand Up @@ -67,7 +66,6 @@ allprojects {
repositories {
google()
mavenCentral()
jcenter()
}
apply plugin: "com.jfrog.bintray"

Expand Down
4 changes: 2 additions & 2 deletions example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ dependencies {
implementation project(':models-parcelable')
implementation project(':vimeo-networking')

implementation "androidx.appcompat:appcompat:1.3.0"
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation "androidx.appcompat:appcompat:1.3.1"
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
}
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.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 0 additions & 4 deletions models-serializable/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ plugins {

apply from: '../publish.gradle'

repositories {
jcenter()
}

generated {
inputPath = 'models/src/main/java/com/vimeo/networking2'
typeGenerated = ModelType.SERIALIZABLE
Expand Down
4 changes: 0 additions & 4 deletions models/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ apply plugin: 'kotlin'
apply plugin: 'kotlin-kapt'
apply from: '../publish.gradle'

repositories {
jcenter()
}

dependencies {
// Okio used by Moshi
implementation "com.squareup.okio:okio:$okioVersion"
Expand Down
4 changes: 0 additions & 4 deletions request/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ apply plugin: 'java-library'
apply plugin: 'kotlin'
apply from: '../publish.gradle'

repositories {
jcenter()
}

dependencies {
compileOnly project(path: ':models', configuration: 'default')
api project(':auth')
Expand Down
45 changes: 4 additions & 41 deletions vimeo-networking/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apply plugin: 'java-library'
apply plugin: 'kotlin'
apply from: '../publish.gradle'

compileJava {
sourceCompatibility = 1.8
Expand All @@ -9,47 +9,10 @@ compileJava {
sourceCompatibility = '1.8'
targetCompatibility = '1.8'

buildscript {
repositories {
maven {
url 'https://plugins.gradle.org/m2/'
}
}
dependencies {
classpath 'net.ltgt.gradle:gradle-apt-plugin:0.16'
}
}

apply plugin: 'net.ltgt.apt'
apply from: '../publish.gradle'

repositories {
jcenter()
}

tasks.withType(Javadoc).all { enabled = true }

dependencies {
api project(path: ':api-core', configuration: 'default')
api project(path: ':request', configuration: 'default')
compileOnly project(path: ':models', configuration: 'default')
}


gradle.projectsEvaluated {
tasks.withType(JavaCompile) {
options.compilerArgs += [ "-AstagAssumeHungarianNotation=true" ]
}
}

task wrapper(type: Wrapper) {
gradleVersion = '2.3.0'
}

gradle.projectsEvaluated {
tasks.withType(JavaCompile) {
aptOptions.processorArgs = [
stagAssumeHungarianNotation: "true"
]
}
api project(':api-core')
api project(':request')
compileOnly project(':models')
}

0 comments on commit d85df78

Please sign in to comment.