Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ jobs:
run: ./.github/workflows/scripts/install-tools.sh
- name: Build
run: melos run build:example_android
build_example_android_3_19:
name: Build Android example app (3.38.1)
build_example_android_3_44:
name: Build Android example app (3.44.0)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v7
Expand All @@ -63,7 +63,7 @@ jobs:
- uses: subosito/flutter-action@v2
with:
channel: stable
flutter-version: 3.38.1
flutter-version: 3.44.0
cache: true
cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:'
- name: Install Tools
Expand All @@ -84,44 +84,44 @@ jobs:
run: ./.github/workflows/scripts/install-tools.sh
- name: Build
run: melos run build:example_ios
build_example_ios_3_19:
name: Build iOS example app (3.38.1)
build_example_ios_3_44:
name: Build iOS example app (3.44.0)
runs-on: macos-latest
steps:
- uses: actions/checkout@v7
- uses: subosito/flutter-action@v2
with:
channel: stable
flutter-version: 3.38.1
flutter-version: 3.44.0
cache: true
cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:'
- name: Install Tools
run: ./.github/workflows/scripts/install-tools.sh
- name: Build
run: melos run build:example_ios
# build_example_macos_stable:
# name: Build macOS example app (stable channel)
# runs-on: macos-latest
# steps:
# - uses: actions/checkout@v7
# - uses: subosito/flutter-action@v2
# with:
# channel: stable
# cache: true
# cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:'
# - name: Install Tools
# run: ./.github/workflows/scripts/install-tools.sh
# - name: Build
# run: melos run build:example_macos
build_example_macos_3_19:
name: Build macOS example app (3.38.1)
build_example_macos_stable:
name: Build macOS example app (stable channel)
runs-on: macos-latest
steps:
- uses: actions/checkout@v7
- uses: subosito/flutter-action@v2
with:
channel: stable
flutter-version: 3.38.1
cache: true
cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:'
- name: Install Tools
run: ./.github/workflows/scripts/install-tools.sh
- name: Build
run: melos run build:example_macos
build_example_macos_3_44:
name: Build macOS example app (3.44.0)
runs-on: macos-latest
steps:
- uses: actions/checkout@v7
- uses: subosito/flutter-action@v2
with:
channel: stable
flutter-version: 3.44.0
cache: true
cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:'
- name: Install Tools
Expand Down
7 changes: 7 additions & 0 deletions flutter_appauth/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [13.0.0-dev.1]

* **Breaking change** updated minimum supported SDK version to Flutter 3.44.0/Dart 3.12.0
* [Android] **Breaking change** updated AGP to 9.0.1
* [Android] migrated Gradle build scripts to Kotlin DSL
* Removed Cocoapods integration from example app on iOS and macOS

## [12.1.0]

* [iOS] added custom browser support. Thanks to the PR from [Kuurse)](https://github.com/Kuurse)
Expand Down
43 changes: 0 additions & 43 deletions flutter_appauth/android/build.gradle

This file was deleted.

42 changes: 42 additions & 0 deletions flutter_appauth/android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import com.android.build.gradle.LibraryExtension

group = "io.crossingthestreams.flutterappauth"
version = "1.0-SNAPSHOT"

buildscript {
repositories {
google()
mavenCentral()
}

dependencies {
classpath("com.android.tools.build:gradle:9.0.1")
}
}

rootProject.allprojects {
repositories {
google()
mavenCentral()
}
}

apply(plugin = "com.android.library")

configure<LibraryExtension> {
compileSdk = 35

namespace = "io.crossingthestreams.flutterappauth"

defaultConfig {
minSdk = 24
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
lint {
disable += "InvalidPackage"
}
}

dependencies {
"implementation"("net.openid:appauth:0.11.1")
}
1 change: 0 additions & 1 deletion flutter_appauth/android/settings.gradle

This file was deleted.

1 change: 1 addition & 0 deletions flutter_appauth/android/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = "flutter_appauth"
68 changes: 0 additions & 68 deletions flutter_appauth/example/android/app/build.gradle

This file was deleted.

60 changes: 60 additions & 0 deletions flutter_appauth/example/android/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import java.util.Properties

plugins {
id("com.android.application")
id("dev.flutter.flutter-gradle-plugin")
}

val localProperties = Properties()
val localPropertiesFile = rootProject.file("local.properties")
if (localPropertiesFile.exists()) {
localPropertiesFile.inputStream().use { localProperties.load(it) }
}

val flutterVersionCode = localProperties.getProperty("flutter.versionCode") ?: "1"
val flutterVersionName = localProperties.getProperty("flutter.versionName") ?: "1.0"

android {
namespace = "io.crossingthestreams.flutter_appauth_example"
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlin {
compilerOptions {
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
}
}

sourceSets {
getByName("main").java.srcDirs("src/main/kotlin")
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId = "io.crossingthestreams.flutter_appauth_example"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdk = flutter.minSdkVersion
targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInt()
versionName = flutterVersionName
manifestPlaceholders["appAuthRedirectScheme"] = "com.duendesoftware.demo"
}

buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig = signingConfigs.getByName("debug")
}
}
}

flutter {
source = "../.."
}
18 changes: 0 additions & 18 deletions flutter_appauth/example/android/build.gradle

This file was deleted.

18 changes: 18 additions & 0 deletions flutter_appauth/example/android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
allprojects {
repositories {
google()
mavenCentral()
}
}

rootProject.layout.buildDirectory.value(layout.projectDirectory.dir("../build"))
subprojects {
project.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir(project.name))
}
subprojects {
project.evaluationDependsOn(":app")
}

tasks.register<Delete>("clean") {
delete(rootProject.layout.buildDirectory)
}
6 changes: 5 additions & 1 deletion flutter_appauth/example/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
org.gradle.jvmargs=-Xmx1536M
org.gradle.jvmargs=-Xmx4096M
android.useAndroidX=true
android.enableJetifier=true
# This builtInKotlin flag was added automatically by Flutter migrator
android.builtInKotlin=false
# This newDsl flag was added automatically by Flutter migrator
android.newDsl=false
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
25 changes: 0 additions & 25 deletions flutter_appauth/example/android/settings.gradle

This file was deleted.

Loading
Loading