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
16 changes: 15 additions & 1 deletion firebase-ai/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
/build
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
local.properties
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ plugins {
}

android {
namespace = "com.google.firebase.example.vertexai"
namespace = "com.google.firebase.example.ailogic"
compileSdk = 36

defaultConfig {
applicationId = "com.google.firebase.example.vertexai"
applicationId = "com.google.firebase.example.ailogic"
minSdk = 23
targetSdk = 36
versionCode = 1
Expand Down Expand Up @@ -58,7 +58,7 @@ dependencies {
implementation(libs.androidx.ui.tooling.preview)
implementation(libs.androidx.material3)

implementation(libs.firebase.vertex.ai)
implementation(libs.firebase.ai)
implementation(libs.kotlinx.serialization.json)

// Required for one-shot operations (to use `ListenableFuture` from Reactive Streams)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.firebase.example.vertexai
package com.google.firebase.example.ailogic

import android.os.Bundle
import androidx.activity.ComponentActivity
Expand All @@ -10,7 +10,7 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import com.google.firebase.example.vertexai.ui.theme.VertexAIInFirebaseTheme
import com.google.firebase.example.ailogic.ui.theme.VertexAIInFirebaseTheme

class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.google.firebase.example.ailogic.java;

public class GeneralViewModel {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.google.firebase.example.ailogic.kotlin

class GeneralViewModel {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.firebase.example.ai.ui.theme
package com.google.firebase.example.ailogic.ui.theme

import androidx.compose.ui.graphics.Color

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.firebase.example.vertexai.ui.theme
package com.google.firebase.example.ailogic.ui.theme

import android.app.Activity
import android.os.Build
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.firebase.example.ai.ui.theme
package com.google.firebase.example.ailogic.ui.theme

import androidx.compose.material3.Typography
import androidx.compose.ui.text.TextStyle
Expand Down
64 changes: 4 additions & 60 deletions firebase-ai/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,62 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
alias(libs.plugins.androidApplication)
alias(libs.plugins.jetbrainsKotlinAndroid)
alias(libs.plugins.composeCompiler)
}

android {
namespace = "com.google.firebase.example.ai"
compileSdk = 36

defaultConfig {
applicationId = "com.google.firebase.example.ai"
minSdk = 23
targetSdk = 36
versionCode = 1
versionName = "1.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "11"
}
buildFeatures {
compose = true
}
}

dependencies {

implementation(libs.androidx.core.ktx)
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.activity.compose)
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.ui)
implementation(libs.androidx.ui.graphics)
implementation(libs.androidx.ui.tooling.preview)
implementation(libs.androidx.material3)

implementation(libs.firebase.ai)

testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
androidTestImplementation(platform(libs.androidx.compose.bom))
androidTestImplementation(libs.androidx.ui.test.junit4)
debugImplementation(libs.androidx.ui.tooling)
debugImplementation(libs.androidx.ui.test.manifest)
alias(libs.plugins.androidApplication) apply false
alias(libs.plugins.jetbrainsKotlinAndroid) apply false
alias(libs.plugins.composeCompiler) apply false
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Apr 04 21:24:10 BST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
File renamed without changes.
File renamed without changes.
File renamed without changes.
24 changes: 0 additions & 24 deletions firebase-ai/src/main/AndroidManifest.xml

This file was deleted.

This file was deleted.

This file was deleted.

Loading