From c45615e1678b52fe7b28b43a982b7afd92b277a9 Mon Sep 17 00:00:00 2001 From: Aslam Anver Date: Thu, 7 Jul 2022 16:00:24 +0530 Subject: [PATCH] gradle major changes --- app/build.gradle | 17 +++++++++-------- build.gradle | 2 +- p2psdk/build.gradle | 30 ++++++++++++++++++++++-------- 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 18bbe84..5a6926d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,10 +1,8 @@ -plugins { - id 'com.android.application' -} +apply plugin: 'com.android.application' android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" + compileSdkVersion 28 + // buildToolsVersion "30.0.3" defaultConfig { applicationId "com.aslam.p2pdemo" @@ -29,14 +27,17 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'], exclude: []) + + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'com.google.android.material:material:1.3.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - testImplementation 'junit:junit:4.+' + + testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + implementation 'com.google.android:flexbox:2.0.1' - // implementation 'lk.payable:p2p:1.1.1' implementation project(path: ':p2psdk') } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 5aaa7ae..fe48523 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.5.3' - + classpath 'com.novoda:bintray-release:0.9.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/p2psdk/build.gradle b/p2psdk/build.gradle index e09d0f4..0ff7a58 100644 --- a/p2psdk/build.gradle +++ b/p2psdk/build.gradle @@ -1,14 +1,25 @@ +apply plugin: 'com.novoda.bintray-release' apply plugin: 'com.android.library' +publish { + userOrg = 'aslam' + repoName = 'android' + groupId = 'com.aslam' + artifactId = 'p2p' + publishVersion = '1.1.8' + desc = 'P2P library provides instant integration (PnP) support for WIFI-Direct P2P for any Android projects plus it remembers the recently connected device and reconnects it automatically when it is available.' + website = 'https://github.com/aslamanver/p2p' +} + android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" + compileSdkVersion 28 + // buildToolsVersion "30.0.3" defaultConfig { minSdkVersion 15 targetSdkVersion 28 - versionCode 117 - versionName "1.1.7" + versionCode 118 + versionName "1.1.8" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" } @@ -27,12 +38,15 @@ android { dependencies { - implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'], exclude: []) + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'com.google.android.material:material:1.3.0' - testImplementation 'junit:junit:4.+' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + implementation 'com.google.code.gson:gson:2.2.4' implementation "org.java-websocket:Java-WebSocket:1.5.1" } \ No newline at end of file