Update android dependencies, remove legacy python/swift grpc plugins

This commit is contained in:
Piv
2023-01-22 20:53:49 +10:30
parent 957880f1fb
commit a3060d7e22
12 changed files with 12 additions and 29 deletions

View File

@@ -7,11 +7,11 @@
<deviceKey> <deviceKey>
<Key> <Key>
<type value="VIRTUAL_DEVICE_PATH" /> <type value="VIRTUAL_DEVICE_PATH" />
<value value="$USER_HOME$/.android/avd/Pixel_3a_API_33_x86_64.avd" /> <value value="$USER_HOME$/.android/avd/Pixel_4_XL_API_31.avd" />
</Key> </Key>
</deviceKey> </deviceKey>
</Target> </Target>
</targetSelectedWithDropDown> </targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2022-10-15T03:44:49.580415Z" /> <timeTargetWasSelectedWithDropDown value="2023-01-22T10:14:55.330012Z" />
</component> </component>
</project> </project>

View File

@@ -6,7 +6,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.3.1' classpath 'com.android.tools.build:gradle:7.4.0'
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.16' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.16'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@@ -20,22 +20,14 @@ configurations {
} }
protobuf { protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.11.0' } protoc { artifact = 'com.google.protobuf:protoc:3.21.12' }
plugins { plugins {
grpc { grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.28.1' // CURRENT_GRPC_VERSION artifact = 'io.grpc:protoc-gen-grpc-java:1.52.0' // CURRENT_GRPC_VERSION
}
grpc_python {
path = "$projectDir/grpc_plugins/grpc_python_plugin_1.28.1-${osdetector.classifier}"
}
if(osdetector.os != 'windows'){
swift {
path = "$projectDir/grpc_plugins/protoc-gen-swift-$osdetector.classifier"
}
grpc_swift {
path = "$projectDir/grpc_plugins/protoc-gen-grpc-swift-$osdetector.classifier"
}
} }
// grpc_python {
// path = "$projectDir/grpc_plugins/grpc_python_plugin_1.28.1-${osdetector.classifier}"
// }
} }
generateProtoTasks { generateProtoTasks {
all().each { task -> all().each { task ->
@@ -48,15 +40,6 @@ protobuf {
grpc { // Options added to --grpc_out grpc { // Options added to --grpc_out
option 'lite' option 'lite'
} }
grpc_python {
outputSubDir = 'python'
}
if(osdetector.os != 'windows'){
swift{}
grpc_swift {
outputSubDir = 'swift'
}
}
} }
} }
} }
@@ -77,7 +60,7 @@ artifacts {
dependencies { dependencies {
implementation 'io.grpc:grpc-okhttp:1.29.0' // CURRENT_GRPC_VERSION implementation 'io.grpc:grpc-okhttp:1.29.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.29.0' // CURRENT_GRPC_VERSION implementation 'io.grpc:grpc-protobuf-lite:1.52.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.29.0' // CURRENT_GRPC_VERSION implementation 'io.grpc:grpc-stub:1.52.0' // CURRENT_GRPC_VERSION
implementation 'javax.annotation:javax.annotation-api:1.2' implementation 'javax.annotation:javax.annotation-api:1.3.2'
} }