Skip to content

Commit

Permalink
Merge pull request #126 from Aisalkyn/master
Browse files Browse the repository at this point in the history
Gradle, sdk, lib updates
  • Loading branch information
Lezh1k authored Apr 24, 2023
2 parents 4c5278b + 63625a7 commit 9031298
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 26 deletions.
7 changes: 4 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ android {
compileSdkVersion 33
defaultConfig {
applicationId "com.example.lezh1k.sensordatacollector"
minSdkVersion 21
minSdkVersion 23
targetSdkVersion 33
versionCode 1
versionName "1.0"
Expand All @@ -20,9 +20,10 @@ android {
}
}
compileOptions {
targetCompatibility 1.8
sourceCompatibility 1.8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
}
namespace 'com.example.lezh1k.sensordatacollector'
}

dependencies {
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.lezh1k.sensordatacollector">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
Expand Down
6 changes: 1 addition & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,9 @@ buildscript {
url "https://maven.google.com"
}
google()
jcenter()

}
dependencies {
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.android.tools.build:gradle:7.3.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -26,7 +23,6 @@ allprojects {
maven {
url "https://maven.google.com"
}
jcenter()
google()
}
}
Expand Down
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Oct 10 12:02:18 YEKT 2020
#Mon Apr 24 17:18:58 KGT 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
zipStoreBase=GRADLE_USER_HOME
25 changes: 12 additions & 13 deletions madlocationmanager/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id 'com.android.library'
id 'com.github.dcendents.android-maven'
id 'maven-publish'
id "com.jfrog.bintray" version "1.8.5"

}

group='com.github.maddevsio'
Expand All @@ -15,32 +15,31 @@ ext {
android {
compileSdkVersion 33
defaultConfig {
minSdkVersion 18
minSdkVersion 23
targetSdkVersion 33
versionCode 1
versionName "1.0"

testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

compileOptions {
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
}
namespace 'mad.location.manager'
}

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

api 'androidx.appcompat:appcompat:1.2.0'
api 'androidx.appcompat:appcompat:1.4.1'
api 'androidx.legacy:legacy-support-v4:1.0.0'
api 'com.google.android.material:material:1.2.1'
api 'androidx.recyclerview:recyclerview:1.1.0'
implementation "com.google.android.gms:play-services-location:21.0.1"
api 'com.google.android.material:material:1.6.0'
implementation 'com.google.android.gms:play-services-location:21.0.1'
implementation 'org.chromium.net:cronet-embedded:98.4758.101'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
Expand Down Expand Up @@ -111,7 +110,6 @@ project.afterEvaluate {
}
}
}

bintray {
dryRun = false
publish = true
Expand Down Expand Up @@ -141,3 +139,4 @@ bintray {
}
}


0 comments on commit 9031298

Please sign in to comment.