diff --git a/samples/admob/rewarded_interstitial_example/.gitignore b/samples/admob/rewarded_interstitial_example/.gitignore index 24476c5d1..29a3a5017 100644 --- a/samples/admob/rewarded_interstitial_example/.gitignore +++ b/samples/admob/rewarded_interstitial_example/.gitignore @@ -27,7 +27,6 @@ migrate_working_dir/ .dart_tool/ .flutter-plugins .flutter-plugins-dependencies -.packages .pub-cache/ .pub/ /build/ diff --git a/samples/admob/rewarded_interstitial_example/.metadata b/samples/admob/rewarded_interstitial_example/.metadata index 9e70ade37..6c1bf2fff 100644 --- a/samples/admob/rewarded_interstitial_example/.metadata +++ b/samples/admob/rewarded_interstitial_example/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 - channel: stable + revision: "db7ef5bf9f59442b0e200a90587e8fa5e0c6336a" + channel: "stable" project_type: app @@ -13,26 +13,14 @@ project_type: app migration: platforms: - platform: root - create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 - base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 + create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a + base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a - platform: android - create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 - base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 + create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a + base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a - platform: ios - create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 - base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 - - platform: linux - create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 - base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 - - platform: macos - create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 - base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 - - platform: web - create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 - base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 - - platform: windows - create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 - base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 + create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a + base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a # User provided section diff --git a/samples/admob/rewarded_interstitial_example/analysis_options.yaml b/samples/admob/rewarded_interstitial_example/analysis_options.yaml index 61b6c4de1..f9b303465 100644 --- a/samples/admob/rewarded_interstitial_example/analysis_options.yaml +++ b/samples/admob/rewarded_interstitial_example/analysis_options.yaml @@ -1,29 +1 @@ -# This file configures the analyzer, which statically analyzes Dart code to -# check for errors, warnings, and lints. -# -# The issues identified by the analyzer are surfaced in the UI of Dart-enabled -# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be -# invoked from the command line by running `flutter analyze`. - -# The following line activates a set of recommended lints for Flutter apps, -# packages, and plugins designed to encourage good coding practices. include: package:flutter_lints/flutter.yaml - -linter: - # The lint rules applied to this project can be customized in the - # section below to disable rules from the `package:flutter_lints/flutter.yaml` - # included above or to enable additional rules. A list of all available lints - # and their documentation is published at - # https://dart-lang.github.io/linter/lints/index.html. - # - # Instead of disabling a lint rule for the entire project in the - # section below, it can also be suppressed for a single line of code - # or a specific dart file by using the `// ignore: name_of_lint` and - # `// ignore_for_file: name_of_lint` syntax on the line or in the file - # producing the lint. - rules: - # avoid_print: false # Uncomment to disable the `avoid_print` rule - # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule - -# Additional information about this file can be found at -# https://dart.dev/guides/language/analysis-options diff --git a/samples/admob/rewarded_interstitial_example/android/app/build.gradle b/samples/admob/rewarded_interstitial_example/android/app/build.gradle index 46d3cd493..1670894ed 100644 --- a/samples/admob/rewarded_interstitial_example/android/app/build.gradle +++ b/samples/admob/rewarded_interstitial_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,11 +22,8 @@ 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 { + namespace "com.example.rewarded_interstitial_example" compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion @@ -46,7 +44,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.rewarded_interstitial_example" // You can update the following values to match your application needs. - // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. + // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion 19 multiDexEnabled true targetSdkVersion flutter.targetSdkVersion @@ -68,5 +66,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.multidex:multidex:2.0.1' } diff --git a/samples/admob/rewarded_interstitial_example/android/app/src/debug/AndroidManifest.xml b/samples/admob/rewarded_interstitial_example/android/app/src/debug/AndroidManifest.xml index 5be1d805c..399f6981d 100644 --- a/samples/admob/rewarded_interstitial_example/android/app/src/debug/AndroidManifest.xml +++ b/samples/admob/rewarded_interstitial_example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + + diff --git a/samples/admob/rewarded_interstitial_example/android/app/src/profile/AndroidManifest.xml b/samples/admob/rewarded_interstitial_example/android/app/src/profile/AndroidManifest.xml index 5be1d805c..399f6981d 100644 --- a/samples/admob/rewarded_interstitial_example/android/app/src/profile/AndroidManifest.xml +++ b/samples/admob/rewarded_interstitial_example/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - +