Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
# Conflicts:
#	gradle.properties
  • Loading branch information
jan-tennert committed Nov 7, 2023
2 parents d112a40 + 71ccf3e commit c4e89aa
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import io.github.jan.supabase.annotations.SupabaseInternal
import io.github.jan.supabase.bodyOrNull
import io.github.jan.supabase.collections.AtomicMutableMap
import io.github.jan.supabase.exceptions.BadRequestRestException
import io.github.jan.supabase.exceptions.HttpRequestException
import io.github.jan.supabase.exceptions.NotFoundRestException
import io.github.jan.supabase.exceptions.RestException
import io.github.jan.supabase.exceptions.UnauthorizedRestException
Expand Down Expand Up @@ -48,8 +49,9 @@ sealed interface Storage : MainPlugin<Storage.Config> {

/**
* Creates a new bucket in the storage
* @param name the name of the bucket
* @param id the id of the bucket
* @param builder overrides bucket config options (like whether the bucket should be public,
* file size limit, etc)
* @throws RestException or one of its subclasses if receiving an error response
* @throws HttpRequestTimeoutException if the request timed out
* @throws HttpRequestException on network related issues
Expand All @@ -72,7 +74,7 @@ sealed interface Storage : MainPlugin<Storage.Config> {
suspend fun retrieveBuckets(): List<Bucket>

/**
* Retrieves a bucket by its [id]
* Retrieves a bucket by its [bucketId]
* @throws RestException or one of its subclasses if receiving an error response
* @throws HttpRequestTimeoutException if the request timed out
* @throws HttpRequestException on network related issues
Expand All @@ -88,7 +90,7 @@ sealed interface Storage : MainPlugin<Storage.Config> {
suspend fun emptyBucket(bucketId: String)

/**
* Deletes a bucket by its [id]
* Deletes a bucket by its [bucketId]
* @throws RestException or one of its subclasses if receiving an error response
* @throws HttpRequestTimeoutException if the request timed out
* @throws HttpRequestException on network related issues
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ kotlin.experimental.tryK2=false
org.jetbrains.compose.experimental.uikit.enabled=true
org.jetbrains.compose.experimental.jscanvas.enabled=true

supabase-version = 1.4.7-dev-1
supabase-version = 1.4.7
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ agp = "8.1.2"
maven-publish = "0.25.3"
apollo-kotlin = "3.8.2"
korlibs = "4.0.10"
detekt = "1.23.1"
detekt = "1.23.3"
moshi = "1.15.0"
jackson = "2.15.3"
browser = "1.6.0"
Expand Down

0 comments on commit c4e89aa

Please sign in to comment.