Skip to content

Commit f359708

Browse files
authored
Apply suggestions from code review
Co-authored-by: S1m <31284753+p1gp1g@users.noreply.github.com>
1 parent 27177e9 commit f359708

1 file changed

Lines changed: 12 additions & 40 deletions

File tree

play-services-core-proto/build.gradle

Lines changed: 12 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,7 @@
44
*/
55

66
apply plugin: 'com.squareup.wire'
7-
apply plugin: 'com.android.library'
8-
apply plugin: 'kotlin-android'
9-
apply plugin: 'maven-publish'
10-
apply plugin: 'signing'
11-
android {
12-
namespace "org.microg.gms.core.proto"
13-
14-
compileSdkVersion androidCompileSdk
15-
buildToolsVersion "$androidBuildVersionTools"
16-
17-
defaultConfig {
18-
versionName version
19-
minSdkVersion androidMinSdk
20-
targetSdkVersion androidTargetSdk
21-
}
22-
23-
buildFeatures {
24-
dataBinding = true
25-
buildConfig = true
26-
}
27-
28-
sourceSets {
29-
main.java.srcDirs += 'src/main/kotlin'
30-
}
31-
32-
compileOptions {
33-
sourceCompatibility = 1.8
34-
targetCompatibility = 1.8
35-
}
36-
37-
kotlinOptions {
38-
jvmTarget = 1.8
39-
}
40-
41-
lintOptions {
42-
disable 'MissingTranslation'
43-
}
44-
}
7+
apply plugin: 'kotlin'
458
dependencies {
469
implementation "com.squareup.wire:wire-runtime:$wireVersion"
4710
api "com.squareup.wire:wire-grpc-client:$wireVersion"
@@ -57,6 +20,15 @@ sourceSets {
5720
main.java.srcDirs += "$buildDir/generated/source/wire"
5821
}
5922

60-
apply from: '../gradle/publish-android.gradle'
23+
compileJava {
24+
sourceCompatibility = 1.8
25+
targetCompatibility = 1.8
26+
}
27+
28+
compileKotlin {
29+
kotlinOptions.jvmTarget = 1.8
30+
}
6131

62-
description = 'microG service implementation for play-services-core-proto'
32+
compileTestKotlin {
33+
kotlinOptions.jvmTarget = 1.8
34+
}

0 commit comments

Comments
 (0)