1
1
apply plugin : ' com.android.library'
2
2
apply plugin : ' kotlin-android'
3
3
apply plugin : ' kotlin-android-extensions'
4
- /*
5
- apply plugin: 'com.google.protobuf'
6
- */
4
+ // apply plugin: 'com.google.protobuf'
5
+
7
6
8
7
android {
9
8
compileSdkVersion 29
@@ -13,7 +12,7 @@ android {
13
12
minSdkVersion 9
14
13
targetSdkVersion 29
15
14
versionCode 1
16
- versionName " 0.11.3 "
15
+ versionName " 1.0 "
17
16
18
17
testInstrumentationRunner " androidx.test.runner.AndroidJUnitRunner"
19
18
consumerProguardFiles " consumer-rules.pro"
@@ -26,15 +25,20 @@ android {
26
25
}
27
26
}
28
27
29
- /*
30
- sourceSets {
31
- main {
32
- proto {
33
- srcDir "$projectDir/src/main/resources/protobuf/"
34
- }
35
- }
36
- }
37
- */
28
+ compileOptions {
29
+ targetCompatibility JavaVersion . VERSION_1_8
30
+ sourceCompatibility JavaVersion . VERSION_1_8
31
+ }
32
+
33
+
34
+ // sourceSets {
35
+ // main {
36
+ // proto {
37
+ // srcDir "$projectDir/src/main/resources/protobuf/"
38
+ // }
39
+ // }
40
+ // }
41
+
38
42
39
43
}
40
44
@@ -56,30 +60,29 @@ dependencies {
56
60
57
61
}
58
62
59
- /*
60
- protobuf {
61
- protoc {
62
- // You still need protoc like in the non-Android case
63
- artifact = 'com.google.protobuf:protoc:3.7.0'
64
- }
65
- plugins {
66
- javalite {
67
- // The codegen for lite comes as a separate artifact
68
- artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
69
- }
70
- }
71
- generatedFilesBaseDir = "$projectDir/src/main/generated"
72
- generateProtoTasks {
73
- all().each { task ->
74
- task.builtins {
75
- // In most cases you don't need the full Java output
76
- // if you use the lite output.
77
- // remove java
78
- }
79
- task.plugins {
80
- javalite { }
81
- }
82
- }
83
- }
84
- }
85
- */
63
+
64
+ // protobuf {
65
+ // protoc {
66
+ // // You still need protoc like in the non-Android case
67
+ // artifact = 'com.google.protobuf:protoc:3.7.0'
68
+ // }
69
+ // plugins {
70
+ // javalite {
71
+ // // The codegen for lite comes as a separate artifact
72
+ // artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
73
+ // }
74
+ // }
75
+ // generatedFilesBaseDir = "$projectDir/src/main/generated"
76
+ // generateProtoTasks {
77
+ // all().each { task ->
78
+ // task.builtins {
79
+ // // In most cases you don't need the full Java output
80
+ // // if you use the lite output.
81
+ // // remove java
82
+ // }
83
+ // task.plugins {
84
+ // javalite { }
85
+ // }
86
+ // }
87
+ // }
88
+ // }
0 commit comments