Skip to content

Commit 3320225

Browse files
committed
Resolved proto-lite dependency version issue.
1 parent 64e5384 commit 3320225

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

app/build.gradle

+16-11
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ android {
1818
minSdkVersion 23
1919
targetSdkVersion 30
2020
versionCode 13
21-
versionName "2.0.9 - ${getGitHash()}"
21+
versionName "2.0.10 - ${getGitHash()}"
2222
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2323
}
2424

@@ -47,24 +47,29 @@ android {
4747
buildConfigField "boolean", "isFilteringByPrefixAllowed", "true"
4848
}
4949
}
50+
51+
compileOptions {
52+
sourceCompatibility JavaVersion.VERSION_1_8
53+
targetCompatibility JavaVersion.VERSION_1_8
54+
}
5055
}
5156

5257
dependencies {
5358
implementation fileTree(include: ['*.jar'], dir: 'libs')
54-
implementation 'androidx.appcompat:appcompat:1.3.0'
55-
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
56-
implementation 'com.google.android.material:material:1.3.0'
59+
implementation 'androidx.appcompat:appcompat:1.3.1'
60+
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
61+
implementation 'com.google.android.material:material:1.1.0'
5762
implementation 'androidx.preference:preference:1.1.1'
5863

59-
implementation 'com.google.protobuf:protobuf-lite:3.0.1'
60-
implementation 'com.google.crypto.tink:tink-android:1.1.0'
64+
implementation 'com.google.protobuf:protobuf-javalite:3.14.0'
65+
implementation 'com.google.crypto.tink:tink-android:1.6.1'
6166
implementation project(path: ':provisioning')
6267

63-
implementation 'com.wang.avi:library:2.1.3'
64-
implementation 'org.greenrobot:eventbus:3.1.1'
65-
implementation 'com.budiyev.android:code-scanner:2.1.0'
68+
implementation 'org.greenrobot:eventbus:3.2.0'
69+
implementation 'com.github.yuriy-budiyev:code-scanner:2.1.0'
70+
implementation 'com.github.firdausmaulan:AVLoadingIndicatorView:2.3.0'
6671

6772
testImplementation 'junit:junit:4.13.2'
68-
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
69-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
73+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
74+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
7075
}

build.gradle

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44

55
repositories {
66
google()
7-
jcenter()
7+
mavenCentral()
88
}
99
dependencies {
1010
classpath 'com.android.tools.build:gradle:4.2.1'
@@ -17,7 +17,9 @@ buildscript {
1717
allprojects {
1818
repositories {
1919
google()
20-
jcenter()
20+
mavenCentral()
21+
maven { url 'https://jitpack.io' }
22+
maven { url "https://maven.google.com" }
2123
}
2224
}
2325

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu May 27 18:24:15 IST 2021
1+
#Wed Aug 04 22:30:17 IST 2021
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-all.zip

provisioning/build.gradle

+13-20
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@ apply plugin: 'com.google.protobuf'
33

44
buildscript {
55
repositories {
6-
jcenter()
76
mavenCentral()
87
}
98
dependencies {
10-
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.16'
9+
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
1110
}
1211
}
1312

1413
allprojects {
1514
repositories {
16-
jcenter()
1715
mavenCentral()
16+
maven { url 'https://jitpack.io' }
1817
}
1918
}
2019

@@ -42,20 +41,14 @@ android {
4241

4342
protobuf {
4443
protoc {
45-
artifact = 'com.google.protobuf:protoc:3.5.1'
46-
}
47-
plugins {
48-
javalite {
49-
artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
50-
}
44+
artifact = 'com.google.protobuf:protoc:3.8.0'
5145
}
5246
generateProtoTasks {
5347
all().each { task ->
5448
task.builtins {
55-
remove java
56-
}
57-
task.plugins {
58-
javalite {}
49+
java {
50+
option 'lite'
51+
}
5952
}
6053
}
6154
}
@@ -64,15 +57,15 @@ protobuf {
6457
dependencies {
6558
implementation fileTree(dir: 'libs', include: ['*.jar'])
6659

67-
implementation 'androidx.appcompat:appcompat:1.3.0'
68-
implementation 'org.greenrobot:eventbus:3.1.1'
69-
implementation 'com.google.protobuf:protobuf-lite:3.0.1'
70-
implementation 'com.google.crypto.tink:tink-android:1.1.0'
60+
implementation 'androidx.appcompat:appcompat:1.3.1'
61+
implementation 'org.greenrobot:eventbus:3.2.0'
62+
implementation 'com.google.protobuf:protobuf-javalite:3.14.0'
63+
implementation 'com.google.crypto.tink:tink-android:1.6.1'
7164
implementation 'com.google.android.gms:play-services-vision:20.1.3'
7265
implementation 'androidx.preference:preference:1.1.1'
73-
implementation 'com.budiyev.android:code-scanner:2.1.0'
66+
implementation 'com.github.yuriy-budiyev:code-scanner:2.1.0'
7467

7568
testImplementation 'junit:junit:4.13.2'
76-
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
77-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
69+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
70+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
7871
}

0 commit comments

Comments
 (0)