mirror of
https://github.com/go-vikunja/app
synced 2025-02-12 01:32:59 +00:00
updated android libraries
renamed build to core from main to avoid name clashes
This commit is contained in:
parent
a7c01e0fc9
commit
7e4f4e79f8
@ -38,14 +38,11 @@ android {
|
||||
main.java.srcDirs += 'src/main/kotlin'
|
||||
}
|
||||
|
||||
lintOptions {
|
||||
disable 'InvalidPackage'
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
applicationId "io.vikunja.app"
|
||||
minSdkVersion 19
|
||||
targetSdkVersion 31
|
||||
targetSdkVersion 33
|
||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||
versionCode flutterVersionCode.toInteger()
|
||||
versionName flutterVersionName
|
||||
@ -74,7 +71,7 @@ android {
|
||||
dimension "deploy"
|
||||
//signingConfig null
|
||||
}
|
||||
main {
|
||||
core {
|
||||
dimension "deploy"
|
||||
signingConfig signingConfigs.debug // TODO add signing key
|
||||
}
|
||||
@ -98,6 +95,10 @@ android {
|
||||
//signingConfig signingConfigs.debug
|
||||
}
|
||||
}
|
||||
lint {
|
||||
disable 'InvalidPackage'
|
||||
}
|
||||
namespace 'io.vikunja.flutteringvikunja'
|
||||
}
|
||||
|
||||
flutter {
|
||||
@ -106,7 +107,7 @@ flutter {
|
||||
|
||||
dependencies {
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20"
|
||||
testImplementation 'junit:junit:4.12'
|
||||
testImplementation 'junit:junit:4.13.2'
|
||||
androidTestImplementation 'com.android.support.test:runner:1.0.2'
|
||||
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
|
||||
}
|
||||
|
@ -1,5 +1,4 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="io.vikunja.flutteringvikunja">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<!-- The INTERNET permission is required for development. Specifically,
|
||||
flutter needs it to communicate with the running application
|
||||
|
@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="ic_launcher_background">#FF455486</color>
|
||||
</resources>
|
@ -1,13 +1,13 @@
|
||||
buildscript {
|
||||
ext.kotlin_version = '1.6.20'
|
||||
ext.kotlin_version = '1.7.20'
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.google.gms:google-services:4.2.0'
|
||||
classpath 'com.android.tools.build:gradle:7.1.3'
|
||||
classpath 'com.google.gms:google-services:4.3.14'
|
||||
classpath 'com.android.tools.build:gradle:7.3.1'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
}
|
||||
}
|
||||
@ -15,7 +15,7 @@ buildscript {
|
||||
allprojects {
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
mavenCentral()
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
|
||||
|
@ -1,7 +1,7 @@
|
||||
import 'dart:developer' as dev;
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_native_timezone/flutter_native_timezone.dart';
|
||||
import 'package:flutter_timezone/flutter_timezone.dart';
|
||||
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
|
||||
import 'package:vikunja_app/api/bucket_implementation.dart';
|
||||
import 'package:vikunja_app/api/client.dart';
|
||||
@ -157,7 +157,7 @@ class VikunjaGlobalState extends State<VikunjaGlobal> {
|
||||
}
|
||||
|
||||
void notificationInitializer() async {
|
||||
currentTimeZone = await FlutterNativeTimezone.getLocalTimezone();
|
||||
currentTimeZone = await FlutterTimezone.getLocalTimezone();
|
||||
notifLaunch = await notificationsPlugin.getNotificationAppLaunchDetails();
|
||||
await notifications.initNotifications(notificationsPlugin);
|
||||
requestIOSPermissions(notificationsPlugin);
|
||||
|
14
pubspec.lock
14
pubspec.lock
@ -244,13 +244,6 @@ packages:
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "5.0.0"
|
||||
flutter_native_timezone:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: flutter_native_timezone
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.0"
|
||||
flutter_secure_storage:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@ -298,6 +291,13 @@ packages:
|
||||
description: flutter
|
||||
source: sdk
|
||||
version: "0.0.0"
|
||||
flutter_timezone:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: flutter_timezone
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.0.4"
|
||||
flutter_typeahead:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
@ -1,7 +1,7 @@
|
||||
name: vikunja_app
|
||||
description: Vikunja as Flutter cross platform app
|
||||
|
||||
version: 0.0.23-alpha
|
||||
version: 0.0.24-alpha
|
||||
|
||||
environment:
|
||||
sdk: ">=2.12.0 <3.0.0"
|
||||
@ -15,7 +15,7 @@ dependencies:
|
||||
intl: ^0.17.0
|
||||
flutter_local_notifications: ^9.8.0+1
|
||||
rxdart: ^0.27.5
|
||||
flutter_native_timezone: ^2.0.0
|
||||
flutter_timezone: ^1.0.4
|
||||
flutter_secure_storage: ^6.0.0
|
||||
datetime_picker_formfield: ^2.0.1
|
||||
flutter_typeahead: ^4.0.0
|
||||
|
Loading…
x
Reference in New Issue
Block a user