Commit ed259325 by Maurits van Beusekom Committed by GitHub

Merge pull request #29 from BaseflowIT/maintenance/update_kotlin_and_gradle

Update Kotlin and Gradle
parents ebc3dc3e 6f5e2be7
...@@ -2,14 +2,14 @@ group 'com.baseflow.permissionhandler' ...@@ -2,14 +2,14 @@ group 'com.baseflow.permissionhandler'
version '1.0-SNAPSHOT' version '1.0-SNAPSHOT'
buildscript { buildscript {
ext.kotlin_version = '1.2.51' ext.kotlin_version = '1.2.71'
repositories { repositories {
google() google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.android.tools.build:gradle:3.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
...@@ -40,7 +40,7 @@ android { ...@@ -40,7 +40,7 @@ android {
} }
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "com.google.code.gson:gson:2.8.5" implementation "com.google.code.gson:gson:2.8.5"
implementation "com.android.support:support-compat:27.1.1" implementation "com.android.support:support-compat:27.1.1"
} }
...@@ -50,8 +50,8 @@ flutter { ...@@ -50,8 +50,8 @@ flutter {
} }
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
} }
buildscript { buildscript {
ext.kotlin_version = '1.1.51' ext.kotlin_version = '1.2.71'
repositories { repositories {
google() google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.4' classpath 'com.android.tools.build:gradle:3.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
......
#Fri Jul 20 12:10:00 CEST 2018 #Wed Oct 10 08:31:26 CEST 2018
distributionBase=GRADLE_USER_HOME 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-4.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
...@@ -46,20 +46,20 @@ class MyApp extends StatelessWidget { ...@@ -46,20 +46,20 @@ class MyApp extends StatelessWidget {
} }
class PermissionWidget extends StatefulWidget { class PermissionWidget extends StatefulWidget {
final PermissionGroup _permissionGroup;
const PermissionWidget(this._permissionGroup); const PermissionWidget(this._permissionGroup);
final PermissionGroup _permissionGroup;
@override @override
_PermissionState createState() => _PermissionState(_permissionGroup); _PermissionState createState() => _PermissionState(_permissionGroup);
} }
class _PermissionState extends State<PermissionWidget> { class _PermissionState extends State<PermissionWidget> {
_PermissionState(this._permissionGroup);
final PermissionGroup _permissionGroup; final PermissionGroup _permissionGroup;
PermissionStatus _permissionStatus = PermissionStatus.unknown; PermissionStatus _permissionStatus = PermissionStatus.unknown;
_PermissionState(this._permissionGroup);
@override @override
void initState() { void initState() {
super.initState(); super.initState();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment