Skip to content

Commit

Permalink
- Updated compileSdkVersion & dependencies versions
Browse files Browse the repository at this point in the history
  • Loading branch information
umair13adil committed Nov 22, 2022
1 parent f199b3c commit e17c88a
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 54 deletions.
16 changes: 8 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'

android {
compileSdkVersion 30
compileSdkVersion 33
defaultConfig {
applicationId "com.blackbox.library.plog"
minSdkVersion 16
targetSdkVersion 30
versionCode 34
versionName "1.0.16"
minSdkVersion 21
targetSdkVersion 33
versionCode 35
versionName "1.0.17"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
buildTypes {
Expand All @@ -34,14 +34,14 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

//RxJav2
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
implementation 'io.reactivex.rxjava2:rxkotlin:2.2.0'

implementation 'com.google.code.gson:gson:2.8.6'
implementation 'com.google.code.gson:gson:2.8.9'

implementation project(path: ':plog')

Expand Down
6 changes: 4 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@

<activity
android:name=".MainActivity"
android:screenOrientation="portrait">
android:screenOrientation="fullSensor"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -25,7 +26,8 @@

<activity
android:name=".HourlyLogsTest"
android:launchMode="singleTask" />
android:launchMode="singleTask"
android:exported="true"/>

</application>
</manifest>
11 changes: 3 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.4.20'
ext.kotlin_version = '1.7.10'
repositories {
mavenCentral()
google()
jcenter()
}
dependencies {
classpath 'com.android.tools:r8:2.2.64'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.android.tools.build:gradle:7.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'

Expand All @@ -20,15 +19,11 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
maven { url 'https://jitpack.io' }
maven {
url "https://repo.eclipse.org/content/repositories/paho-snapshots/"
}
maven {
url "http://storage.googleapis.com/r8-releases/raw/master"
}
}
}

Expand Down
22 changes: 1 addition & 21 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,23 +1,3 @@
# Project-wide Gradle settings.

# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.

# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html

# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048M
org.gradle.configureondemand=false
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
android.enableD8.desugaring=true
android.enableD8=true
kapt.incremental.apt=true

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Jun 30 16:04:31 PKT 2020
#Fri Jul 10 16:37:04 PKT 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
22 changes: 10 additions & 12 deletions plog/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'com.github.dcendents.android-maven'

group = 'com.github.umair13adil'

android {
compileSdkVersion 30
compileSdkVersion 33
defaultConfig {
minSdkVersion 16
targetSdkVersion 30
versionCode 45
versionName "1.0.16"
minSdkVersion 21
targetSdkVersion 33
versionCode 46
versionName "1.0.17"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

}
Expand All @@ -32,10 +31,10 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'

//RxJav2
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
Expand All @@ -46,9 +45,8 @@ dependencies {
implementation 'org.eclipse.paho:org.eclipse.paho.android.service:1.1.1'

//WorkManager
def work_version = "2.3.4"
implementation "androidx.work:work-runtime-ktx:$work_version"
implementation "androidx.work:work-rxjava2:$work_version"
implementation "androidx.work:work-runtime-ktx:2.7.1"
implementation "androidx.work:work-rxjava2:2.7.1"
}
repositories {
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion plog/src/main/java/com/blackbox/plog/elk/ECSMapper.kt
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ object ECSMapper {
}
}

throwable?.let {
throwable?.let { it ->
it.stackTrace.forEach {
stackTrace.add(it.toString())
}
Expand Down

0 comments on commit e17c88a

Please sign in to comment.