diff --git a/.github/workflows/shipit.yml b/.github/workflows/shipit.yml index 27b31abbf..1cc44776b 100644 --- a/.github/workflows/shipit.yml +++ b/.github/workflows/shipit.yml @@ -12,19 +12,20 @@ jobs: steps: - uses: actions/checkout@v2.3.4 - name: Cache - uses: actions/cache@v2.1.3 + uses: actions/cache@v2.1.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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 32a1ceed2..70bcfa7cd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,19 +12,20 @@ jobs: steps: - uses: actions/checkout@v2.3.4 - name: Cache - uses: actions/cache@v2.1.3 + uses: actions/cache@v2.1.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 diff --git a/api-core/build.gradle b/api-core/build.gradle index 1fced990f..a7d08082f 100644 --- a/api-core/build.gradle +++ b/api-core/build.gradle @@ -2,10 +2,6 @@ apply plugin: 'java-library' apply plugin: 'kotlin' apply from: '../publish.gradle' -repositories { - jcenter() -} - dependencies { compileOnly project(':models') diff --git a/auth/build.gradle b/auth/build.gradle index 01c99d922..a86053c35 100644 --- a/auth/build.gradle +++ b/auth/build.gradle @@ -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') diff --git a/build.gradle b/build.gradle index 6233dd78d..b79849ce2 100644 --- a/build.gradle +++ b/build.gradle @@ -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" } @@ -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" } @@ -67,7 +66,6 @@ allprojects { repositories { google() mavenCentral() - jcenter() } apply plugin: "com.jfrog.bintray" diff --git a/example/build.gradle b/example/build.gradle index d93c793d8..8194abfdf 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -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' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 29e413457..af7be50b1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/models-serializable/build.gradle b/models-serializable/build.gradle index 2c94f51ae..8b7b19314 100644 --- a/models-serializable/build.gradle +++ b/models-serializable/build.gradle @@ -8,10 +8,6 @@ plugins { apply from: '../publish.gradle' -repositories { - jcenter() -} - generated { inputPath = 'models/src/main/java/com/vimeo/networking2' typeGenerated = ModelType.SERIALIZABLE diff --git a/models/build.gradle b/models/build.gradle index 3667a35b0..75ccf5394 100644 --- a/models/build.gradle +++ b/models/build.gradle @@ -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" diff --git a/request/build.gradle b/request/build.gradle index 5457b6526..7eab27b3a 100644 --- a/request/build.gradle +++ b/request/build.gradle @@ -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') diff --git a/vimeo-networking/build.gradle b/vimeo-networking/build.gradle index d71b87d7c..8337e4a54 100644 --- a/vimeo-networking/build.gradle +++ b/vimeo-networking/build.gradle @@ -1,5 +1,5 @@ -apply plugin: 'java-library' apply plugin: 'kotlin' +apply from: '../publish.gradle' compileJava { sourceCompatibility = 1.8 @@ -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') }