Skip to content

Commit 9cc9054

Browse files
refactor(storage): Refactor Java and Objc to Kotlin and Swift (#17795)
1 parent be12eed commit 9cc9054

File tree

38 files changed

+3044
-4951
lines changed

38 files changed

+3044
-4951
lines changed

packages/firebase_storage/firebase_storage/android/build.gradle

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@ apply plugin: 'com.android.library'
55
apply from: file("local-config.gradle")
66

77
buildscript {
8+
ext.kotlin_version = "1.8.22"
89
repositories {
910
google()
1011
mavenCentral()
1112
}
13+
dependencies {
14+
classpath 'com.android.tools.build:gradle:8.1.4'
15+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
16+
}
1217
}
1318

1419
rootProject.allprojects {
@@ -39,6 +44,8 @@ def getRootProjectExtOrCoreProperty(name, firebaseCoreProject) {
3944
return rootProject.ext.get('FlutterFire').get(name)
4045
}
4146

47+
apply plugin: 'kotlin-android'
48+
4249
android {
4350
// Conditional for compatibility with AGP <4.2.
4451
if (project.android.hasProperty("namespace")) {
@@ -52,11 +59,20 @@ android {
5259
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
5360
}
5461

62+
kotlinOptions {
63+
jvmTarget = project.ext.javaVersion
64+
}
65+
5566
compileOptions {
5667
sourceCompatibility project.ext.javaVersion
5768
targetCompatibility project.ext.javaVersion
5869
}
5970

71+
sourceSets {
72+
main.java.srcDirs += "src/main/kotlin"
73+
test.java.srcDirs += "src/test/kotlin"
74+
}
75+
6076
buildFeatures {
6177
buildConfig = true
6278
}

packages/firebase_storage/firebase_storage/android/src/main/java/io/flutter/plugins/firebase/storage/FlutterFirebaseAppRegistrar.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

packages/firebase_storage/firebase_storage/android/src/main/java/io/flutter/plugins/firebase/storage/FlutterFirebaseStorageException.java

Lines changed: 0 additions & 87 deletions
This file was deleted.

0 commit comments

Comments
 (0)