Skip to content

Commit d19f44f

Browse files
authored
Merge pull request #5 from droid-lover/sachin/easy_analytics_android11_support
Updating EasyAnalytics to Android11 API 30 and updated sample app too
2 parents 1040d4c + f7130ae commit d19f44f

9 files changed

Lines changed: 39 additions & 20 deletions

File tree

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/deploymentTargetDropDown.xml

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ apply plugin: 'dagger.hilt.android.plugin'
88

99
android {
1010
compileSdkVersion 30
11-
buildToolsVersion "30.0.3"
1211

1312
defaultConfig {
1413
minSdkVersion 23
@@ -46,12 +45,11 @@ android {
4645
enabled = true
4746
}
4847
compileOptions {
49-
sourceCompatibility JavaVersion.VERSION_1_8
50-
targetCompatibility JavaVersion.VERSION_1_8
48+
sourceCompatibility = JavaVersion.VERSION_11
49+
targetCompatibility = JavaVersion.VERSION_11
5150
}
52-
5351
kotlinOptions {
54-
jvmTarget = JavaVersion.VERSION_1_8.toString()
52+
jvmTarget = JavaVersion.VERSION_11.toString()
5553
}
5654
}
5755

@@ -118,7 +116,7 @@ dependencies {
118116

119117

120118
//Easy Analytics
121-
// implementation(project(":easyAnalytics"))
122-
implementation 'com.github.myJarvis:EasyAnalytics:0.0.2'
119+
implementation(project(":easyAnalytics"))
120+
// implementation 'com.github.myJarvis:EasyAnalytics:0.0.2'
123121

124122
}
14 KB
Loading

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = "1.3.72"
3+
ext.kotlin_version = "1.4.10"
44
ext.hilt_version='2.28-alpha'
55
ext.lifecycle_version='2.2.0'
66
ext.retrofit_version = "2.9.0"
@@ -14,7 +14,7 @@ buildscript {
1414
maven { url 'https://jitpack.io' }
1515
}
1616
dependencies {
17-
classpath "com.android.tools.build:gradle:4.0.1"
17+
classpath 'com.android.tools.build:gradle:7.0.0'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
2020
}

easyAnalytics/build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ android {
1212
defaultConfig {
1313
minSdkVersion 23
1414
targetSdkVersion 30
15-
versionCode 1
16-
versionName "1.0"
1715

1816
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1917
consumerProguardFiles "consumer-rules.pro"
@@ -26,11 +24,11 @@ android {
2624
}
2725
}
2826
compileOptions {
29-
sourceCompatibility JavaVersion.VERSION_1_8
30-
targetCompatibility JavaVersion.VERSION_1_8
27+
sourceCompatibility JavaVersion.VERSION_11
28+
targetCompatibility JavaVersion.VERSION_11
3129
}
3230
kotlinOptions {
33-
jvmTarget = '1.8'
31+
jvmTarget = JavaVersion.VERSION_11.toString()
3432
}
3533
}
3634

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

0 commit comments

Comments
 (0)