From e51abc3d2b81c9cc0d5697dcf54c0b9aad5b0443 Mon Sep 17 00:00:00 2001 From: Harsh Bhikadia Date: Fri, 5 Jan 2024 12:17:17 +0530 Subject: [PATCH 1/4] feat: support gradle 8 https://developer.android.com/build/configure-app-module#set-namespace --- android/build.gradle | 4 ++++ example/android/app/build.gradle | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/android/build.gradle b/android/build.gradle index f2873bec..78c139e8 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -30,6 +30,10 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { + if (project.android.hasProperty("namespace")) { + namespace 'com.cr0manty.vpn_check' + } + compileSdkVersion 31 defaultConfig { diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 5f0fd1dd..dcbc76ec 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -25,6 +25,10 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { + if (project.android.hasProperty("namespace")) { + namespace 'com.cr0manty.vpn_check' + } + compileSdkVersion 31 lintOptions { From fe2dc3d30850f330ad18c12fc559318d98e1b9b1 Mon Sep 17 00:00:00 2001 From: Harsh Bhikadia Date: Fri, 5 Jan 2024 12:19:43 +0530 Subject: [PATCH 2/4] fix: typo in import --- lib/ttlock.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ttlock.dart b/lib/ttlock.dart index aedd84c3..0ebf1243 100644 --- a/lib/ttlock.dart +++ b/lib/ttlock.dart @@ -1,6 +1,6 @@ import 'package:flutter/services.dart'; import 'package:ttlock_flutter/ttdoorSensor.dart'; -import 'package:ttlock_flutter/ttremoteKey.dart'; +import 'package:ttlock_flutter/ttremotekey.dart'; import 'package:ttlock_flutter/ttremoteKeypad.dart'; import 'dart:convert' as convert; import 'ttgateway.dart'; From 1ca5ab2d8686b7431ab2347fcee29e12d44dd6f3 Mon Sep 17 00:00:00 2001 From: Harsh Bhikadia Date: Fri, 5 Jan 2024 12:25:22 +0530 Subject: [PATCH 3/4] fix(android): namespace --- android/build.gradle | 2 +- example/android/app/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 78c139e8..d2495ebd 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -31,7 +31,7 @@ apply plugin: 'com.android.library' android { if (project.android.hasProperty("namespace")) { - namespace 'com.cr0manty.vpn_check' + namespace 'com.ttlock.ttlock_flutter' } compileSdkVersion 31 diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index dcbc76ec..94ce5ebb 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { if (project.android.hasProperty("namespace")) { - namespace 'com.cr0manty.vpn_check' + namespace 'com.ttlock.ttlock_flutter_example' } compileSdkVersion 31 From 7795573994841c5c56930cc5af9ebe1cee0d37d9 Mon Sep 17 00:00:00 2001 From: Harsh Bhikadia Date: Fri, 5 Jan 2024 17:07:11 +0530 Subject: [PATCH 4/4] build(android): properly setting libs --- android/build.gradle | 2 +- example/android/app/build.gradle | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index d2495ebd..4fd819a2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -22,7 +22,7 @@ rootProject.allprojects { google() jcenter() flatDir { - dirs 'libs' + dirs project(':ttlock_flutter').file('libs') } } } diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 94ce5ebb..c542a415 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -59,11 +59,6 @@ android { } } } -repositories { - flatDir { - dirs 'libs', '..\\..\\..\\android\\libs' - } -} flutter { source '../..'