Loc-Chain/nearby_connections
3
0
Fork 0
mirror of https://github.com/hackku21/nearby_connections.git synced 2024-10-27 19:14:01 +00:00
Code Issues Projects Releases Wiki Activity

save androidx migration

Browse Source
This commit is contained in:
Prerak Mann 2019-08-11 21:27:39 +05:30
parent 7f4f3ede19
commit 5c38d2d5dc
6 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
android/build.gradle
View File

@ -10,6 +10,16 @@ buildscript {
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.4.0' classpath 'com.android.tools.build:gradle:3.4.0'
} }
subprojects {
project.configurations.all {
resolutionStrategy.eachDependency { details ->
if (details.requested.group == 'androidx.core'
&& !details.requested.name.contains('androidx') ) {
details.useVersion "1.0.1"
}
}
}
}
} }
rootProject.allprojects { rootProject.allprojects {
@ -26,7 +36,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 16 minSdkVersion 16
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
lintOptions { lintOptions {
disable 'InvalidPackage' disable 'InvalidPackage'

9
android/src/main/java/com/pkmnapps/nearby_connections/NearbyConnectionsPlugin.java
View File

@ -3,11 +3,10 @@ package com.pkmnapps.nearby_connections;
import android.Manifest; import android.Manifest;
import android.app.Activity; import android.app.Activity;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.ParcelFileDescriptor; import androidx.annotation.NonNull;
import android.support.annotation.NonNull; import androidx.core.app.ActivityCompat;
import android.support.v4.app.ActivityCompat; import androidx.core.content.ContextCompat;
import android.support.v4.content.ContextCompat;
import com.google.android.gms.nearby.Nearby; import com.google.android.gms.nearby.Nearby;
import com.google.android.gms.nearby.connection.AdvertisingOptions; import com.google.android.gms.nearby.connection.AdvertisingOptions;

6
example/android/app/build.gradle
View File

@ -38,7 +38,7 @@ android {
targetSdkVersion 28 targetSdkVersion 28
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {
@ -56,6 +56,6 @@ flutter {
dependencies { dependencies {
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'androidx.test:runner:1.1.0'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
} }

2
example/android/gradle.properties
View File

@ -1 +1,3 @@
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx1536M

7
example/pubspec.lock
View File

@ -81,13 +81,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.6.2" version: "1.6.2"
path_provider:
dependency: "direct main"
description:
name: path_provider
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
pedantic: pedantic:
dependency: transitive dependency: transitive
description: description:

1
example/pubspec.yaml
View File

@ -11,7 +11,6 @@ dependencies:
# The following adds the Cupertino Icons font to your application. # The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons. # Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^0.1.2 cupertino_icons: ^0.1.2
path_provider: ^1.2.0
image_picker: ^0.6.1+2 image_picker: ^0.6.1+2
dev_dependencies: dev_dependencies: