Skip to content

Commit 9031298

Browse files
authored
Merge pull request #126 from Aisalkyn/master
Gradle, sdk, lib updates
2 parents 4c5278b + 63625a7 commit 9031298

File tree

5 files changed

+21
-26
lines changed

5 files changed

+21
-26
lines changed

app/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ android {
44
compileSdkVersion 33
55
defaultConfig {
66
applicationId "com.example.lezh1k.sensordatacollector"
7-
minSdkVersion 21
7+
minSdkVersion 23
88
targetSdkVersion 33
99
versionCode 1
1010
versionName "1.0"
@@ -20,9 +20,10 @@ android {
2020
}
2121
}
2222
compileOptions {
23-
targetCompatibility 1.8
24-
sourceCompatibility 1.8
23+
targetCompatibility JavaVersion.VERSION_1_8
24+
sourceCompatibility JavaVersion.VERSION_1_8
2525
}
26+
namespace 'com.example.lezh1k.sensordatacollector'
2627
}
2728

2829
dependencies {

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.example.lezh1k.sensordatacollector">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
65
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

build.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@ buildscript {
88
url "https://maven.google.com"
99
}
1010
google()
11-
jcenter()
12-
1311
}
1412
dependencies {
15-
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
16-
classpath 'com.android.tools.build:gradle:4.2.2'
13+
classpath 'com.android.tools.build:gradle:7.3.1'
1714

1815
// NOTE: Do not place your application dependencies here; they belong
1916
// in the individual module build.gradle files
@@ -26,7 +23,6 @@ allprojects {
2623
maven {
2724
url "https://maven.google.com"
2825
}
29-
jcenter()
3026
google()
3127
}
3228
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Oct 10 12:02:18 YEKT 2020
1+
#Mon Apr 24 17:18:58 KGT 2023
22
distributionBase=GRADLE_USER_HOME
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
34
distributionPath=wrapper/dists
4-
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
6+
zipStoreBase=GRADLE_USER_HOME

madlocationmanager/build.gradle

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
22
id 'com.android.library'
3-
id 'com.github.dcendents.android-maven'
43
id 'maven-publish'
54
id "com.jfrog.bintray" version "1.8.5"
5+
66
}
77

88
group='com.github.maddevsio'
@@ -15,32 +15,31 @@ ext {
1515
android {
1616
compileSdkVersion 33
1717
defaultConfig {
18-
minSdkVersion 18
18+
minSdkVersion 23
1919
targetSdkVersion 33
20-
versionCode 1
21-
versionName "1.0"
22-
2320
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
24-
2521
}
26-
2722
buildTypes {
2823
release {
2924
minifyEnabled false
3025
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3126
}
3227
}
33-
28+
compileOptions {
29+
targetCompatibility JavaVersion.VERSION_1_8
30+
sourceCompatibility JavaVersion.VERSION_1_8
31+
}
32+
namespace 'mad.location.manager'
3433
}
3534

3635
dependencies {
3736
implementation fileTree(dir: 'libs', include: ['*.jar'])
3837

39-
api 'androidx.appcompat:appcompat:1.2.0'
38+
api 'androidx.appcompat:appcompat:1.4.1'
4039
api 'androidx.legacy:legacy-support-v4:1.0.0'
41-
api 'com.google.android.material:material:1.2.1'
42-
api 'androidx.recyclerview:recyclerview:1.1.0'
43-
implementation "com.google.android.gms:play-services-location:21.0.1"
40+
api 'com.google.android.material:material:1.6.0'
41+
implementation 'com.google.android.gms:play-services-location:21.0.1'
42+
implementation 'org.chromium.net:cronet-embedded:98.4758.101'
4443
testImplementation 'junit:junit:4.13.2'
4544
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
4645
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
@@ -111,7 +110,6 @@ project.afterEvaluate {
111110
}
112111
}
113112
}
114-
115113
bintray {
116114
dryRun = false
117115
publish = true
@@ -141,3 +139,4 @@ bintray {
141139
}
142140
}
143141

142+

0 commit comments

Comments
 (0)