Skip to content

Commit ec8faea

Browse files
authored
Merge pull request #9 from techie66/downgrade_gradle
Downgrade gradle
2 parents 24d5a55 + bff7d45 commit ec8faea

File tree

10 files changed

+228
-163
lines changed

10 files changed

+228
-163
lines changed

app/build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
apply plugin: 'com.android.application'
2+
apply plugin: 'kotlin-android'
23

34
android {
45
compileSdkVersion 30
@@ -8,18 +9,15 @@ android {
89
vectorDrawables.useSupportLibrary = true
910
minSdkVersion 16
1011
targetSdkVersion 30
11-
versionCode 7
12-
versionName "1.6"
12+
versionCode 8
13+
versionName "1.7"
1314
}
1415
buildTypes {
1516
release {
1617
minifyEnabled false
1718
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1819
}
1920
}
20-
lintOptions {
21-
abortOnError false
22-
}
2321
compileOptions {
2422
sourceCompatibility = '1.8'
2523
targetCompatibility = '1.8'
@@ -29,6 +27,10 @@ android {
2927
url 'https://maven.google.com'
3028
}
3129
}
30+
namespace 'net.xtlive.EDL.Dashboard'
31+
lint {
32+
abortOnError false
33+
}
3234
}
3335

3436
dependencies {
@@ -41,5 +43,5 @@ dependencies {
4143
// ViewModel and LiveData
4244
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
4345
implementation 'com.google.android.material:material:1.4.0'
44-
implementation 'com.github.anastr:speedviewlib:1.3.1'
46+
implementation 'com.github.anastr:speedviewlib:1.6.1'
4547
}

app/src/androidTest/java/net/xtlive/EDL/Dashboard/ApplicationTest.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 3 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="net.xtlive.EDL.Dashboard">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<uses-permission android:name="android.permission.BLUETOOTH" />
76
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -22,7 +21,8 @@
2221
tools:ignore="GoogleAppIndexingWarning">
2322
<activity
2423
android:name="net.xtlive.EDL.Dashboard.MainActivity"
25-
android:theme="@style/AppTheme">
24+
android:theme="@style/AppTheme"
25+
android:exported="true">
2626
<intent-filter>
2727
<action android:name="android.intent.action.MAIN" />
2828

14.2 KB
Loading

build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4+
ext.kotlin_version = '1.6.21'
45
repositories {
5-
jcenter()
6+
mavenCentral()
67
google()
78
maven {
89
url 'https://www.jitpack.io'
910
}
1011
}
1112
dependencies {
12-
classpath 'com.android.tools.build:gradle:4.2.0'
13+
classpath 'com.android.tools.build:gradle:7.4.2'
14+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1315

1416
// NOTE: Do not place your application dependencies here; they belong
1517
// in the individual module build.gradle files
@@ -18,7 +20,7 @@ buildscript {
1820

1921
allprojects {
2022
repositories {
21-
jcenter()
23+
mavenCentral()
2224
google()
2325
}
2426
}

gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19-
android.enableJetifier=true
19+
android.enableJetifier=false
20+
android.nonFinalResIds=false
21+
android.nonTransitiveRClass=false
2022
android.useAndroidX=true

gradle/wrapper/gradle-wrapper.jar

5.76 KB
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Sat Feb 20 16:57:52 UTC 2021
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

0 commit comments

Comments
 (0)