Merge pull request #631 from micolous/version-update

roll forward dependency versions; externalise some dep versions
metrodroid · Sep 28, 2019 · df262db · df262db
2 parents c5822b2 + b08de1b
commit df262db
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 30 deletions.
diff --git a/build.gradle b/build.gradle
@@ -20,15 +20,18 @@ buildscript {
         build_version = '29.0.0'
         android_sdk_version = 29
         android_min_version = 16
+        android_gradle_version = '3.4.1'
+        protobuf_version = '3.10.0-rc-1'
+        protobuf_gradle_version = '0.8.10'
     }
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.8'
+        classpath "com.android.tools.build:gradle:$android_gradle_version"
+        classpath "com.google.protobuf:protobuf-gradle-plugin:$protobuf_gradle_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.6'
@@ -217,7 +220,7 @@ dependencies {
     implementation "androidx.cardview:cardview:1.0.0"
     implementation "androidx.annotation:annotation:1.0.0"
     implementation "androidx.preference:preference:1.0.0"
-    implementation 'com.google.protobuf:protobuf-lite:3.0.1'
+    implementation "com.google.protobuf:protobuf-javalite:$protobuf_version"
     implementation project(':leaflet')
     implementation project(':material-design-icons')
     implementation project(':proto')
@@ -376,7 +379,7 @@ kotlin {
                 implementation 'commons-io:commons-io:2.5'
                 implementation 'org.apache.commons:commons-lang3:3.5'
                 implementation "org.jetbrains.kotlinx:kotlinx-io-jvm:$kotlinio_version"
-                implementation 'com.google.protobuf:protobuf-lite:3.0.1'
+                implementation "com.google.protobuf:protobuf-javalite:$protobuf_version"
                 implementation 'com.github.ajalt:clikt:2.1.0'
                 implementation group: 'xmlpull', name: 'xmlpull', version: '1.1.3.4a'
                 implementation project(':proto')

diff --git a/jvmcli/build.gradle b/jvmcli/build.gradle
@@ -9,26 +9,17 @@ allprojects {
 }
 
 buildscript {
-    ext {
-        kotlin_version = '1.3.11'
-        lint_version = '26.2.1'
-        support_version = '28.0.0'
-        android_test_version = '1.1.0'
-        build_version = '28.0.3'
-        android_sdk_version = 28
-        android_min_version = 16
-    }
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.6'
+        classpath "com.android.tools.build:gradle:$android_gradle_version"
+        classpath "com.google.protobuf:protobuf-gradle-plugin:$protobuf_gradle_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-	classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.3'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.3'
     }
 }
 

diff --git a/proto/build.gradle b/proto/build.gradle
@@ -13,7 +13,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.8'
+        classpath "com.google.protobuf:protobuf-gradle-plugin:$protobuf_gradle_version"
     }
 }
 
@@ -27,29 +27,22 @@ compileJava {
 }
 
 dependencies {
-    implementation 'com.google.protobuf:protobuf-lite:3.0.1'
+    implementation "com.google.protobuf:protobuf-javalite:$protobuf_version"
 }
 
 protobuf {
     protoc {
         // You still need protoc like in the non-Android case
-        artifact = 'com.google.protobuf:protoc:3.7.1'
-    }
-    plugins {
-        javalite {
-            // The codegen for lite comes as a separate artifact
-            artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
-        }
+        artifact = "com.google.protobuf:protoc:$protobuf_version"
     }
     generateProtoTasks {
         all().each { task ->
             task.builtins {
-                // In most cases you don't need the full Java output
-                // if you use the lite output.
-                remove java
+                java {
+                    option "lite"
+                }
             }
             task.plugins {
-                javalite { }
                 objc {}
             }
         }
@@ -122,4 +115,4 @@ repositories {
 // workaround for https://youtrack.jetbrains.com/issue/KT-27170
 configurations {
     compileClasspath
-}
+}