Procházet zdrojové kódy

imp: updated gradle dependencies

flutter-beta
Julian Steenbakker před 5 roky
rodič
revize
7422f73754
V databázi nebyl nalezen žádný známý klíč pro tento podpis ID GPG klíče: ACF0400DFB95F3FD
5 změnil soubory, kde provedl 20 přidání a 35 odebrání
  1. +8
    -13
      android/build.gradle
  2. +0
    -4
      example/android/app/build.gradle
  3. +4
    -6
      example/android/build.gradle
  4. +1
    -1
      example/android/gradle/wrapper/gradle-wrapper.properties
  5. +7
    -11
      example/android/settings.gradle

+ 8
- 13
android/build.gradle Zobrazit soubor

@@ -2,14 +2,14 @@ group 'net.touchcapture.qr.flutterqr'
version '1.0-SNAPSHOT' version '1.0-SNAPSHOT'


buildscript { buildscript {
ext.kotlin_version = '1.4.30'
ext.kotlin_version = '1.5.10'
repositories { repositories {
google() google()
jcenter()
mavenCentral()
} }


dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.2'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
@@ -17,19 +17,16 @@ buildscript {
rootProject.allprojects { rootProject.allprojects {
repositories { repositories {
google() google()
jcenter()
mavenCentral()
} }
} }


apply plugin: 'com.android.library' apply plugin: 'com.android.library'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'


android { android {
compileSdkVersion 30 compileSdkVersion 30



sourceSets { sourceSets {
main.java.srcDirs += 'src/main/kotlin' main.java.srcDirs += 'src/main/kotlin'
} }
@@ -38,17 +35,15 @@ android {
minSdkVersion 20 minSdkVersion 20
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
lintOptions {
disable 'InvalidPackage'
buildFeatures {
viewBinding = true
} }
aaptOptions.cruncherEnabled = false
aaptOptions.useNewCruncher = false

} }


dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false } implementation('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false }
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'com.google.zxing:core:3.3.0' implementation 'com.google.zxing:core:3.3.0'
} }

+ 0
- 4
example/android/app/build.gradle Zobrazit soubor

@@ -32,10 +32,6 @@ android {
main.java.srcDirs += 'src/main/kotlin' main.java.srcDirs += 'src/main/kotlin'
} }


lintOptions {
disable 'InvalidPackage'
}

defaultConfig { defaultConfig {
applicationId "net.touchcapture.qr.flutterqrexample" applicationId "net.touchcapture.qr.flutterqrexample"
// minSdkVersion is determined by Native View. // minSdkVersion is determined by Native View.


+ 4
- 6
example/android/build.gradle Zobrazit soubor

@@ -1,12 +1,12 @@
buildscript { buildscript {
ext.kotlin_version = '1.4.30'
ext.kotlin_version = '1.5.10'
repositories { repositories {
google() google()
jcenter()
mavenCentral()
} }


dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.2'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
@@ -14,15 +14,13 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
google() google()
jcenter()
mavenCentral()
} }
} }


rootProject.buildDir = '../build' rootProject.buildDir = '../build'
subprojects { subprojects {
project.buildDir = "${rootProject.buildDir}/${project.name}" project.buildDir = "${rootProject.buildDir}/${project.name}"
}
subprojects {
project.evaluationDependsOn(':app') project.evaluationDependsOn(':app')
} }




+ 1
- 1
example/android/gradle/wrapper/gradle-wrapper.properties Zobrazit soubor

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

+ 7
- 11
example/android/settings.gradle Zobrazit soubor

@@ -1,15 +1,11 @@
include ':app' include ':app'


def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
def properties = new Properties()


def plugins = new Properties()
def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
if (pluginsFile.exists()) {
pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
}
assert localPropertiesFile.exists()
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }


plugins.each { name, path ->
def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
include ":$name"
project(":$name").projectDir = pluginDirectory
}
def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"

Načítá se…
Zrušit
Uložit