From 5ee16915883c77308a8936c2ed5654aed933be6c Mon Sep 17 00:00:00 2001 From: "nicholas.doglio@vimeo.com" Date: Wed, 4 Aug 2021 13:50:06 -0400 Subject: [PATCH 01/10] Bump Gradle to the latest (7.1.1) --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 29e41345..af7be50b 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 From eacaa5b856f08b20b20e2cc601ad6d5e0346fd43 Mon Sep 17 00:00:00 2001 From: "nicholas.doglio@vimeo.com" Date: Wed, 4 Aug 2021 13:53:28 -0400 Subject: [PATCH 02/10] Bump AGP to the latest (7.0.0) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6233dd78..e79d31cc 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { 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" } From 4bab8b33c10925dde256f39ba0c703e48606396f Mon Sep 17 00:00:00 2001 From: "nicholas.doglio@vimeo.com" Date: Wed, 4 Aug 2021 13:53:54 -0400 Subject: [PATCH 03/10] Bump Classgraph to the latest (4.8.111) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e79d31cc..1026d352 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ 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" podamVersion = "7.2.7.RELEASE" From 377998f2335b0b7753ff9ace0eed4a4dfb9298aa Mon Sep 17 00:00:00 2001 From: "nicholas.doglio@vimeo.com" Date: Wed, 4 Aug 2021 13:54:17 -0400 Subject: [PATCH 04/10] Bump Robolectric to the latest (4.6.1) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1026d352..1bee750e 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ ext { buildToolsVersion = '29.0.3' classgraphVersion = '4.8.111' assertJVersion = '3.20.2' - robolectricVersion = "4.5.1" + robolectricVersion = "4.6.1" podamVersion = "7.2.7.RELEASE" } From dc1e11c7d72c33a13667b98d1558e1e654b8b892 Mon Sep 17 00:00:00 2001 From: "nicholas.doglio@vimeo.com" Date: Wed, 4 Aug 2021 13:54:41 -0400 Subject: [PATCH 05/10] Bump Constraint Layout to the latest (2.1.0) --- example/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/build.gradle b/example/build.gradle index d93c793d..d30d48fc 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -30,5 +30,5 @@ dependencies { implementation project(':vimeo-networking') implementation "androidx.appcompat:appcompat:1.3.0" - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'androidx.constraintlayout:constraintlayout:2.1.0' } From ae934cdddcbe71c39187a237091f0bfa900c62a0 Mon Sep 17 00:00:00 2001 From: "nicholas.doglio@vimeo.com" Date: Wed, 4 Aug 2021 13:54:59 -0400 Subject: [PATCH 06/10] Bump AppCompat to the latest (1.3.1) --- example/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/build.gradle b/example/build.gradle index d30d48fc..8194abfd 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.appcompat:appcompat:1.3.1" implementation 'androidx.constraintlayout:constraintlayout:2.1.0' } From 9d5230197457a79a076418623b6ea8205a59d000 Mon Sep 17 00:00:00 2001 From: "nicholas.doglio@vimeo.com" Date: Wed, 4 Aug 2021 13:55:47 -0400 Subject: [PATCH 07/10] Remove Gradle apt plugin as it's no longer used --- vimeo-networking/build.gradle | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/vimeo-networking/build.gradle b/vimeo-networking/build.gradle index d71b87d7..a2934830 100644 --- a/vimeo-networking/build.gradle +++ b/vimeo-networking/build.gradle @@ -9,18 +9,6 @@ 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 { From b1eb9ef5939aaf3a45c1fc8b4f6f115876deae79 Mon Sep 17 00:00:00 2001 From: "nicholas.doglio@vimeo.com" Date: Wed, 4 Aug 2021 13:56:52 -0400 Subject: [PATCH 08/10] Clean up vimeo-networking build file --- vimeo-networking/build.gradle | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/vimeo-networking/build.gradle b/vimeo-networking/build.gradle index a2934830..8337e4a5 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,35 +9,10 @@ compileJava { sourceCompatibility = '1.8' targetCompatibility = '1.8' -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') } From fbb925958b4415b82c9a6f9f0284b2b2f2273b87 Mon Sep 17 00:00:00 2001 From: "nicholas.doglio@vimeo.com" Date: Thu, 5 Aug 2021 16:53:47 -0400 Subject: [PATCH 09/10] Remove jcenter usage --- api-core/build.gradle | 4 ---- auth/build.gradle | 4 ---- build.gradle | 2 -- models-serializable/build.gradle | 4 ---- models/build.gradle | 4 ---- request/build.gradle | 4 ---- 6 files changed, 22 deletions(-) diff --git a/api-core/build.gradle b/api-core/build.gradle index 1fced990..a7d08082 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 01c99d92..a86053c3 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 1bee750e..b79849ce 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,6 @@ buildscript { repositories { google() mavenCentral() - jcenter() } dependencies { classpath 'com.android.tools.build:gradle:7.0.0' @@ -67,7 +66,6 @@ allprojects { repositories { google() mavenCentral() - jcenter() } apply plugin: "com.jfrog.bintray" diff --git a/models-serializable/build.gradle b/models-serializable/build.gradle index 2c94f51a..8b7b1931 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 3667a35b..75ccf539 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 5457b652..7eab27b3 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') From f0c2a3adf49cb4c0b955bba75487b8289d0b7b6d Mon Sep 17 00:00:00 2001 From: "nicholas.doglio@vimeo.com" Date: Tue, 10 Aug 2021 11:03:55 -0400 Subject: [PATCH 10/10] Update workflows to use JDK 11 --- .github/workflows/shipit.yml | 11 ++++++----- .github/workflows/test.yml | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/shipit.yml b/.github/workflows/shipit.yml index 27b31abb..1cc44776 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 32a1ceed..70bcfa7c 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