diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index c1c347f..e02dac9 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -7,11 +7,11 @@ - + - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index a905ce6..b601366 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } 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' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb87..8049c68 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/protobuf/build.gradle b/protobuf/build.gradle index efb905c..c6531b2 100644 --- a/protobuf/build.gradle +++ b/protobuf/build.gradle @@ -20,22 +20,14 @@ configurations { } protobuf { - protoc { artifact = 'com.google.protobuf:protoc:3.11.0' } + protoc { artifact = 'com.google.protobuf:protoc:3.21.12' } plugins { grpc { - artifact = 'io.grpc:protoc-gen-grpc-java:1.28.1' // 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" - } + 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}" +// } } generateProtoTasks { all().each { task -> @@ -48,15 +40,6 @@ protobuf { grpc { // Options added to --grpc_out option 'lite' } - grpc_python { - outputSubDir = 'python' - } - if(osdetector.os != 'windows'){ - swift{} - grpc_swift { - outputSubDir = 'swift' - } - } } } } @@ -77,7 +60,7 @@ artifacts { dependencies { 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-stub:1.29.0' // CURRENT_GRPC_VERSION - implementation 'javax.annotation:javax.annotation-api:1.2' + implementation 'io.grpc:grpc-protobuf-lite:1.52.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.52.0' // CURRENT_GRPC_VERSION + implementation 'javax.annotation:javax.annotation-api:1.3.2' } \ No newline at end of file diff --git a/protobuf/grpc_plugins/grpc_plugin_support.lib b/protobuf/grpc_plugins/grpc_plugin_support.lib deleted file mode 100644 index 13b516d..0000000 Binary files a/protobuf/grpc_plugins/grpc_plugin_support.lib and /dev/null differ diff --git a/protobuf/grpc_plugins/grpc_python_plugin_1.28.1-linux-x86_64 b/protobuf/grpc_plugins/grpc_python_plugin_1.28.1-linux-x86_64 deleted file mode 100755 index 4c56401..0000000 Binary files a/protobuf/grpc_plugins/grpc_python_plugin_1.28.1-linux-x86_64 and /dev/null differ diff --git a/protobuf/grpc_plugins/grpc_python_plugin_1.28.1-osx-x86_64 b/protobuf/grpc_plugins/grpc_python_plugin_1.28.1-osx-x86_64 deleted file mode 100755 index e08ae9e..0000000 Binary files a/protobuf/grpc_plugins/grpc_python_plugin_1.28.1-osx-x86_64 and /dev/null differ diff --git a/protobuf/grpc_plugins/grpc_python_plugin_1.28.1-windows-x86_64 b/protobuf/grpc_plugins/grpc_python_plugin_1.28.1-windows-x86_64 deleted file mode 100644 index d293c7f..0000000 Binary files a/protobuf/grpc_plugins/grpc_python_plugin_1.28.1-windows-x86_64 and /dev/null differ diff --git a/protobuf/grpc_plugins/protoc-gen-grpc-swift-linux-x86_64 b/protobuf/grpc_plugins/protoc-gen-grpc-swift-linux-x86_64 deleted file mode 100755 index 5419c39..0000000 Binary files a/protobuf/grpc_plugins/protoc-gen-grpc-swift-linux-x86_64 and /dev/null differ diff --git a/protobuf/grpc_plugins/protoc-gen-grpc-swift-osx-x86_64 b/protobuf/grpc_plugins/protoc-gen-grpc-swift-osx-x86_64 deleted file mode 100755 index 954d56c..0000000 Binary files a/protobuf/grpc_plugins/protoc-gen-grpc-swift-osx-x86_64 and /dev/null differ diff --git a/protobuf/grpc_plugins/protoc-gen-swift-linux-x86_64 b/protobuf/grpc_plugins/protoc-gen-swift-linux-x86_64 deleted file mode 100755 index 9a23e21..0000000 Binary files a/protobuf/grpc_plugins/protoc-gen-swift-linux-x86_64 and /dev/null differ diff --git a/protobuf/grpc_plugins/protoc-gen-swift-osx-x86_64 b/protobuf/grpc_plugins/protoc-gen-swift-osx-x86_64 deleted file mode 100755 index 1433cab..0000000 Binary files a/protobuf/grpc_plugins/protoc-gen-swift-osx-x86_64 and /dev/null differ