Skip to content

Commit

Permalink
Upgraded project setting to latest version
Browse files Browse the repository at this point in the history
  • Loading branch information
jagtapkiran committed Mar 31, 2023
1 parent 9179873 commit 46adafa
Show file tree
Hide file tree
Showing 11 changed files with 198 additions and 148 deletions.
26 changes: 16 additions & 10 deletions app/build.gradle
Expand Up @@ -4,12 +4,12 @@ plugins {
apply plugin: 'kotlin-android'

android {
compileSdk 31
compileSdk 33

defaultConfig {
applicationId "com.gumlet.insightsdemo"
minSdk 19
targetSdk 31
targetSdk 33
versionCode 12
versionName "3.3"
multiDexEnabled true
Expand All @@ -26,24 +26,30 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
namespace 'com.gumlet.insightsdemo'
lint {
abortOnError false
}
}

dependencies {
implementation "androidx.multidex:multidex:2.0.1"
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.8.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

//Exoplayer dependency
implementation 'com.google.android.exoplayer:exoplayer:2.15.1'
implementation 'com.gumlet.gumlet-insights-sdk-exoplayer:collector-exoplayer:1.0.1'

if (rootProject.ext.developLocal) {
api project(':app:collector-exoplayer')
}else{
api 'com.gumlet.gumlet-insights-sdk-exoplayer:collector-exoplayer:1.0.1'
}

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
implementation "androidx.core:core-ktx:1.7.0"
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation "androidx.core:core-ktx:1.9.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
21 changes: 10 additions & 11 deletions app/collector-exoplayer/build.gradle
Expand Up @@ -4,13 +4,11 @@ plugins {
apply plugin: 'kotlin-android'
apply plugin: 'com.vanniktech.maven.publish'
android {
compileSdk 31
compileSdk 33

defaultConfig {
minSdk 16
targetSdk 31
versionCode 1
versionName "1.0"
targetSdk 33

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -26,7 +24,8 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
namespace 'com.gumlet.insights.exoplayer'
lint {
abortOnError false
}
}
Expand All @@ -36,7 +35,7 @@ dependencies {
if (rootProject.ext.developLocal) {
api project(':app:collector')
}else{
api 'com.gumlet.gumlet-insights-sdk-exoplayer:collector:1.0.0'
api 'com.gumlet.gumlet-insights-sdk-exoplayer:collector:1.0.1'
}

//Retrofit
Expand All @@ -48,11 +47,11 @@ dependencies {
implementation 'io.reactivex:rxandroid:1.2.1'

implementation "com.google.android.exoplayer:exoplayer:2.15.1"
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.8.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
implementation "androidx.core:core-ktx:1.7.0"
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation "androidx.core:core-ktx:1.9.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
3 changes: 1 addition & 2 deletions app/collector-exoplayer/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gumlet.insights.exoplayer">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

</manifest>
23 changes: 11 additions & 12 deletions app/collector/build.gradle
Expand Up @@ -5,13 +5,11 @@ apply plugin: 'kotlin-android'
apply plugin: 'com.vanniktech.maven.publish'

android {
compileSdk 31
compileSdk 33

defaultConfig {
minSdk 16
targetSdk 31
versionCode 1
versionName "1.0"
targetSdk 33
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -27,18 +25,19 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

lintOptions {
namespace 'com.gumlet.insights'
lint {
abortOnError false
}

}

dependencies {

implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.8.0'
implementation 'com.squareup.okhttp3:okhttp:3.14.9'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'org.apache.commons:commons-text:1.7'
implementation 'io.reactivex:rxjava:1.3.8'
implementation 'io.reactivex:rxandroid:1.2.1'
Expand All @@ -51,14 +50,14 @@ dependencies {

implementation 'androidx.multidex:multidex:2.0.1'

implementation "androidx.core:core-ktx:1.7.0"
implementation "androidx.core:core-ktx:1.9.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

testImplementation 'junit:junit:4.13.2'
testImplementation 'com.google.truth:truth:1.0.1'

androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'com.google.truth:truth:1.0.1'
}
repositories {
Expand Down
3 changes: 1 addition & 2 deletions app/collector/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gumlet.insights">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gumlet.insightsdemo">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET"/>
<application
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
@@ -1,12 +1,12 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.6.0-RC'
ext.kotlin_version = '1.8.0'
repositories {
google()
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:7.0.3"
classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

//Added for releasing library to Maven Repository
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Expand Up @@ -17,6 +17,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
android.disableAutomaticComponentCreation=true

# Added POM Details for maven publish
GROUP=com.gumlet.gumlet-insights-sdk-exoplayer
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 2 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
#Thu Oct 21 15:42:31 IST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 46adafa

Please sign in to comment.