Skip to content

Commit 13135b8

Browse files
authored
Upgrade platform (#13)
1 parent e5fbadd commit 13135b8

File tree

11 files changed

+217
-151
lines changed

11 files changed

+217
-151
lines changed

app/build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,16 @@ android {
2323
}
2424
}
2525
compileOptions {
26-
sourceCompatibility JavaVersion.VERSION_1_8
27-
targetCompatibility JavaVersion.VERSION_1_8
26+
sourceCompatibility JavaVersion.VERSION_11
27+
targetCompatibility JavaVersion.VERSION_11
2828
}
2929
kotlinOptions {
30-
jvmTarget = '1.8'
30+
jvmTarget = '11'
3131
}
32+
namespace 'com.telefonica.androidlogger.app'
3233
}
3334

3435
dependencies {
35-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
36-
implementation 'androidx.core:core-ktx:1.3.2'
3736
implementation 'androidx.appcompat:appcompat:1.2.0'
38-
implementation 'com.google.android.material:material:$support_version'
3937
implementation project(':library')
4038
}

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.telefonica.androidlogger.app">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<application
76
android:name=".AndroidLoggerApplication"

build.gradle

Lines changed: 3 additions & 3 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.4.10"
3+
ext.kotlin_version = '1.6.21'
44
ext.support_version = "1.2.1"
55
repositories {
66
google()
@@ -10,7 +10,7 @@ buildscript {
1010
}
1111
}
1212
dependencies {
13-
classpath "com.android.tools.build:gradle:4.0.2"
13+
classpath 'com.android.tools.build:gradle:7.4.2'
1414
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1515

1616
// NOTE: Do not place your application dependencies here; they belong
@@ -37,7 +37,7 @@ detekt {
3737
}
3838
}
3939

40-
tasks.detekt.jvmTarget = "1.8"
40+
tasks.detekt.jvmTarget = "11"
4141

4242
allprojects {
4343

gradle.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ org.gradle.jvmargs=-Xmx6656m -Dfile.encoding=UTF-8
1414
org.gradle.parallel=true
1515

1616
android.useAndroidX=true
17-
# Automatically convert third-party libraries to use AndroidX
18-
android.enableJetifier=true
19-
2017
kapt.incremental.apt=true
2118
# It's going to be deleted in Kotlin 1.8
2219
kapt.use.worker.api=true

gradle/wrapper/gradle-wrapper.jar

5.08 KB
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Wed Jul 29 17:39:42 CEST 2020
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

0 commit comments

Comments
 (0)