diff --git a/packages/iabtcf_consent_info/android/build.gradle b/packages/iabtcf_consent_info/android/build.gradle index 8eae75d..05b9c12 100644 --- a/packages/iabtcf_consent_info/android/build.gradle +++ b/packages/iabtcf_consent_info/android/build.gradle @@ -1,19 +1,11 @@ +plugins { + id "com.android.library" + id "kotlin-android" +} + group 'com.gabriel.terwesten' version '1.0-SNAPSHOT' -buildscript { - ext.kotlin_version = '1.7.21' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - rootProject.allprojects { repositories { google() @@ -21,21 +13,18 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - android { - compileSdkVersion 31 + namespace "com.gabriel.terwesten.iabtcf_consent_info" + compileSdk 34 sourceSets { main.java.srcDirs += 'src/main/kotlin' } defaultConfig { - minSdkVersion 16 + minSdk 19 } } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "androidx.preference:preference-ktx:1.2.0" } diff --git a/packages/iabtcf_consent_info/android/gradle.properties b/packages/iabtcf_consent_info/android/gradle.properties index 94adc3a..b69a3d1 100644 --- a/packages/iabtcf_consent_info/android/gradle.properties +++ b/packages/iabtcf_consent_info/android/gradle.properties @@ -1,3 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/packages/iabtcf_consent_info/android/gradle/wrapper/gradle-wrapper.properties b/packages/iabtcf_consent_info/android/gradle/wrapper/gradle-wrapper.properties index cb24abd..3c85cfe 100644 --- a/packages/iabtcf_consent_info/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/iabtcf_consent_info/android/gradle/wrapper/gradle-wrapper.properties @@ -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.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip diff --git a/packages/iabtcf_consent_info/android/settings.gradle b/packages/iabtcf_consent_info/android/settings.gradle index 2fc4fa4..24250a6 100644 --- a/packages/iabtcf_consent_info/android/settings.gradle +++ b/packages/iabtcf_consent_info/android/settings.gradle @@ -1 +1,14 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id "com.android.application" version "8.5.2" apply false + id "org.jetbrains.kotlin.android" version "1.7.21" apply false +} + rootProject.name = 'iabtcf_consent_info' diff --git a/packages/iabtcf_consent_info/android/src/main/AndroidManifest.xml b/packages/iabtcf_consent_info/android/src/main/AndroidManifest.xml index b19fca4..a2f47b6 100644 --- a/packages/iabtcf_consent_info/android/src/main/AndroidManifest.xml +++ b/packages/iabtcf_consent_info/android/src/main/AndroidManifest.xml @@ -1,3 +1,2 @@ - + diff --git a/packages/iabtcf_consent_info/example/android/app/build.gradle b/packages/iabtcf_consent_info/example/android/app/build.gradle index 399ae29..2a72e2c 100644 --- a/packages/iabtcf_consent_info/example/android/app/build.gradle +++ b/packages/iabtcf_consent_info/example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,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,12 +22,9 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { - compileSdkVersion 31 + namespace "com.example.iabtcf_consent_info_example" + compileSdk 34 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -34,8 +32,8 @@ android { defaultConfig { applicationId "com.example.iabtcf_consent_info_example" - minSdkVersion 16 - targetSdkVersion 31 + minSdk 21 + targetSdk 34 multiDexEnabled true versionCode flutterVersionCode.toInteger() versionName flutterVersionName @@ -56,6 +54,5 @@ flutter { dependencies { implementation "androidx.multidex:multidex:2.0.1" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "androidx.preference:preference-ktx:1.2.0" } diff --git a/packages/iabtcf_consent_info/example/android/app/src/debug/AndroidManifest.xml b/packages/iabtcf_consent_info/example/android/app/src/debug/AndroidManifest.xml index cf56bcb..f880684 100644 --- a/packages/iabtcf_consent_info/example/android/app/src/debug/AndroidManifest.xml +++ b/packages/iabtcf_consent_info/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/packages/iabtcf_consent_info/example/android/app/src/main/AndroidManifest.xml b/packages/iabtcf_consent_info/example/android/app/src/main/AndroidManifest.xml index b574969..54c4cb2 100644 --- a/packages/iabtcf_consent_info/example/android/app/src/main/AndroidManifest.xml +++ b/packages/iabtcf_consent_info/example/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + + diff --git a/packages/iabtcf_consent_info/example/android/build.gradle b/packages/iabtcf_consent_info/example/android/build.gradle index 9fbb189..bc157bd 100644 --- a/packages/iabtcf_consent_info/example/android/build.gradle +++ b/packages/iabtcf_consent_info/example/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.7.21' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() @@ -26,6 +13,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/packages/iabtcf_consent_info/example/android/gradle.properties b/packages/iabtcf_consent_info/example/android/gradle.properties index 94adc3a..b69a3d1 100644 --- a/packages/iabtcf_consent_info/example/android/gradle.properties +++ b/packages/iabtcf_consent_info/example/android/gradle.properties @@ -1,3 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/packages/iabtcf_consent_info/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/iabtcf_consent_info/example/android/gradle/wrapper/gradle-wrapper.properties index cc5527d..7aeeb11 100644 --- a/packages/iabtcf_consent_info/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/iabtcf_consent_info/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip diff --git a/packages/iabtcf_consent_info/example/android/settings.gradle b/packages/iabtcf_consent_info/example/android/settings.gradle index 44e62bc..b259e7f 100644 --- a/packages/iabtcf_consent_info/example/android/settings.gradle +++ b/packages/iabtcf_consent_info/example/android/settings.gradle @@ -1,11 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.5.2" apply false + id "org.jetbrains.kotlin.android" version "1.7.21" apply false +} + +include ":app" diff --git a/packages/iabtcf_consent_info/example/integration_test/test.dart b/packages/iabtcf_consent_info/example/integration_test/e2e_test.dart similarity index 100% rename from packages/iabtcf_consent_info/example/integration_test/test.dart rename to packages/iabtcf_consent_info/example/integration_test/e2e_test.dart diff --git a/pubspec.lock b/pubspec.lock index 74dd7c8..900c772 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: args - sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.5.0" async: dependency: transitive description: @@ -53,18 +53,18 @@ packages: dependency: transitive description: name: cli_util - sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7 + sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 url: "https://pub.dev" source: hosted - version: "0.4.0" + version: "0.4.1" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" conventional_commit: dependency: transitive description: @@ -93,26 +93,26 @@ packages: dependency: transitive description: name: graphs - sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 + sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" http: dependency: transitive description: name: http - sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.2" http_parser: dependency: transitive description: name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + sha256: "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.1.0" io: dependency: transitive description: @@ -125,18 +125,18 @@ packages: dependency: transitive description: name: json_annotation - sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" url: "https://pub.dev" source: hosted - version: "4.8.1" + version: "4.9.0" matcher: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" melos: dependency: "direct dev" description: @@ -149,10 +149,10 @@ packages: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.15.0" mustache_template: dependency: transitive description: @@ -181,10 +181,10 @@ packages: dependency: transitive description: name: platform - sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59" + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "3.1.5" pool: dependency: transitive description: @@ -237,10 +237,10 @@ packages: dependency: transitive description: name: quiver - sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47 + sha256: ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2 url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.2" source_span: dependency: transitive description: @@ -269,10 +269,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" term_glyph: dependency: transitive description: @@ -285,10 +285,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.3" typed_data: dependency: transitive description: @@ -305,6 +305,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" + web: + dependency: transitive + description: + name: web + sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062 + url: "https://pub.dev" + source: hosted + version: "1.0.0" yaml: dependency: transitive description: @@ -317,10 +325,10 @@ packages: dependency: transitive description: name: yaml_edit - sha256: "1579d4a0340a83cf9e4d580ea51a16329c916973bffd5bd4b45e911b25d46bfd" + sha256: e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.2.1" sdks: - dart: ">=3.0.0 <4.0.0" + dart: ">=3.4.0 <4.0.0" flutter: ">=1.20.0"