Merge pull request #10 from MicroPyramid/dev

Dev

Author: ashwin31

.flutter-plugins

@@ -1,3 +1,10 @@
+plugins {
+ id "com.android.application"
+ id "kotlin-android"
+ id "dev.flutter.flutter-gradle-plugin"
+ id "com.google.gms.google-services"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +13,6 @@ if (localPropertiesFile.exists()) {
  }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
- throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
  flutterVersionCode = '1'
@@ -21,23 +23,28 @@ if (flutterVersionName == null) {
  flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'com.google.gms.google-services'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
- compileSdkVersion 31
+ namespace "io.bottlecrm"
+ compileSdk 35
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_11
+ targetCompatibility JavaVersion.VERSION_11
+ }
+
+ kotlinOptions {
+ jvmTarget = '11'
+ }
 
  sourceSets {
  main.java.srcDirs += 'src/main/kotlin'
  }
 
  defaultConfig {
  // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
- applicationId "com.example.bottle_crm"
- minSdkVersion 21
- targetSdkVersion 31
+ applicationId "io.bottlecrm"
+ minSdkVersion 23
+ targetSdkVersion 35
  multiDexEnabled true
  versionCode flutterVersionCode.toInteger()
  versionName flutterVersionName
@@ -58,6 +65,6 @@ flutter {
 
 dependencies {
  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
- implementation platform('com.google.firebase:firebase-bom:29.1.0')
+ implementation platform('com.google.firebase:firebase-bom:33.7.0')
  implementation 'com.google.firebase:firebase-analytics'
 }

.flutter-plugins-dependencies

@@ -9,7 +9,7 @@
  "client_info": {
  "mobilesdk_app_id": "1:74115878447:android:858fb769df26bb2c5900da",
  "android_client_info": {
- "package_name": "com.example.bottle_crm"
+ "package_name": "io.bottlecrm"
  }
  },
  "oauth_client": [

android/app/build.gradle

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.bottle_crm">
+ package="io.bottlecrm">
  <!-- Flutter needs it to communicate with the running application
  to allow setting breakpoints, to provide hot reload, etc.
  -->

android/app/google-services.json

@@ -1,12 +1,14 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.bottle_crm">
+ package="io.bottlecrm">
 
  <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
  <application
  android:label="Bottle CRM"
  android:icon="@mipmap/launcher_icon"
- android:usesCleartextTraffic="true">
+ android:usesCleartextTraffic="true"
+ android:enableOnBackInvokedCallback="true">
  <activity
  android:exported="true"
  android:name=".MainActivity"

android/app/src/debug/AndroidManifest.xml

@@ -1,4 +1,4 @@
-package com.example.bottle_crm
+package io.bottlecrm
 
 import io.flutter.embedding.android.FlutterActivity
 

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.bottle_crm">
+ package="io.bottlecrm">
  <!-- Flutter needs it to communicate with the running application
  to allow setting breakpoints, to provide hot reload, etc.
  -->

android/app/src/main/kotlin/com/example/bottle_crm/MainActivity.kt renamed to android/app/src/main/kotlin/io/bottlecrm/MainActivity.kt

@@ -1,22 +1,41 @@
 buildscript {
- ext.kotlin_version = '1.6.10'
+ ext.kotlin_version = '2.1.0'
  repositories {
  google()
- jcenter()
+ mavenCentral()
  maven { url 'https://jitpack.io' }
  }
 
  dependencies {
- classpath 'com.android.tools.build:gradle:7.0.2'
+ classpath 'com.android.tools.build:gradle:8.7.3'
  classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- classpath 'com.google.gms:google-services:4.3.10'
+ classpath 'com.google.gms:google-services:4.4.2'
  }
 }
 
 allprojects {
  repositories {
  google()
- jcenter()
+ mavenCentral()
+ }
+}
+
+subprojects {
+ afterEvaluate { project ->
+ if (project.hasProperty("android")) {
+ project.android {
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_11
+ targetCompatibility JavaVersion.VERSION_11
+ }
+ }
+ }
+ 
+ project.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+ kotlinOptions {
+ jvmTarget = '11'
+ }
+ }
  }
 }
 
@@ -26,6 +45,6 @@ subprojects {
  project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
- delete rootProject.buildDir
+tasks.register("clean", Delete) {
+ delete rootProject.layout.buildDirectory
 }

android/app/src/profile/AndroidManifest.xml

@@ -1,3 +1,6 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=2g -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
+android.enableR8=true
+android.nonTransitiveRClass=true
+android.nonFinalResIds=false