Skip to content

Commit bae43c5

Browse files
authored
Merge pull request #56 from passageidentity/PSG-4533
PSG-4533: Added namespace in build.gradle
2 parents 6cb70cd + d778ea2 commit bae43c5

File tree

2 files changed

+32
-18
lines changed

2 files changed

+32
-18
lines changed

android/build.gradle

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,20 @@
1+
plugins {
2+
id "com.android.library"
3+
id "kotlin-android"
4+
}
5+
16
group 'id.passage.passage_flutter'
27
version '1.0-SNAPSHOT'
38

4-
buildscript {
5-
ext.kotlin_version = '1.8.10'
6-
repositories {
7-
google()
8-
mavenCentral()
9-
}
10-
11-
dependencies {
12-
classpath 'com.android.tools.build:gradle:7.3.1'
13-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
14-
}
15-
}
16-
179
allprojects {
1810
repositories {
1911
google()
2012
mavenCentral()
2113
}
2214
}
2315

24-
apply plugin: 'com.android.library'
25-
apply plugin: 'kotlin-android'
26-
2716
android {
17+
namespace 'id.passage.passage_flutter'
2818
compileSdkVersion 34
2919

3020
compileOptions {
@@ -49,7 +39,7 @@ android {
4939
testImplementation 'org.jetbrains.kotlin:kotlin-test'
5040
testImplementation 'org.mockito:mockito-core:5.0.0'
5141
implementation 'id.passage.android:passage:1.8.2'
52-
implementation 'com.google.code.gson:gson:2.9.0'
42+
implementation 'com.google.code.gson:gson:2.10.1'
5343
}
5444

5545
testOptions {
@@ -63,5 +53,4 @@ android {
6353
}
6454
}
6555
}
66-
6756
}

android/settings.gradle

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,26 @@
11
rootProject.name = 'passage_flutter'
2+
pluginManagement {
3+
def flutterSdkPath = {
4+
def properties = new Properties()
5+
file("local.properties").withInputStream { properties.load(it) }
6+
def flutterSdkPath = properties.getProperty("flutter.sdk")
7+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
8+
return flutterSdkPath
9+
}()
10+
11+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
12+
13+
repositories {
14+
google()
15+
mavenCentral()
16+
gradlePluginPortal()
17+
}
18+
}
19+
20+
plugins {
21+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
22+
id "com.android.application" version "8.5.2" apply false
23+
id "org.jetbrains.kotlin.android" version "2.0.10" apply false
24+
}
25+
26+
include ":app"

0 commit comments

Comments
 (0)