Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Releases/v1.0.1 #145

Merged
merged 4 commits into from
Aug 21, 2024
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
10 changes: 0 additions & 10 deletions .github/dependabot.yml

This file was deleted.

52 changes: 0 additions & 52 deletions .github/workflows/android-cicd.yml

This file was deleted.

34 changes: 0 additions & 34 deletions .github/workflows/artifactory-deploy-from-tag.yml

This file was deleted.

59 changes: 0 additions & 59 deletions .github/workflows/dokka-on-release.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@
.externalNativeBuild
.cxx
local.properties
devdocs-site
devdocs-site-release
46 changes: 22 additions & 24 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id "org.jetbrains.kotlin.plugin.compose"
}

android {
namespace "com.mux.video.vod.demo"
compileSdk 34
compileSdk 35

defaultConfig {
applicationId "com.mux.video.vod.demo"
minSdk 21
targetSdkVersion 34
targetSdkVersion 35
versionCode 1
versionName "1.0"

Expand All @@ -37,9 +38,6 @@ android {
viewBinding true
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.5.14'
}
packagingOptions {
resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
Expand All @@ -51,24 +49,24 @@ dependencies {

implementation project(':library')

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.10.0'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.activity:activity-ktx:1.8.2'
implementation "androidx.fragment:fragment-ktx:1.6.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.activity:activity-ktx:1.9.1'
implementation "androidx.fragment:fragment-ktx:1.8.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4"
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'net.danlew:android.joda:2.12.7'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
implementation 'androidx.activity:activity-compose:1.8.0'
implementation "androidx.compose.ui:ui:$compose_ui_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
implementation "androidx.compose.runtime:runtime-livedata:$compose_ui_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$compose_ui_version"
implementation "androidx.compose.material:material-icons-extended:$compose_ui_version"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.4'
implementation 'androidx.activity:activity-compose:1.9.1'
implementation "androidx.compose.ui:ui:1.6.8"
implementation "androidx.compose.ui:ui-tooling-preview:1.6.8"
implementation "androidx.compose.runtime:runtime-livedata:1.6.8"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.4"
implementation "androidx.compose.material:material-icons-extended:1.6.8"
implementation "com.google.accompanist:accompanist-systemuicontroller:0.34.0"

implementation 'androidx.compose.material:material:1.6.1'
implementation 'androidx.compose.material:material:1.6.8'

implementation "com.squareup.okhttp3:logging-interceptor:4.12.0"
implementation "com.squareup.okhttp3:okhttp:4.12.0"
Expand All @@ -77,9 +75,9 @@ dependencies {
implementation 'com.squareup.retrofit2:converter-scalars:2.9.0'

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version"
debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version"
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version"
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.6.8"
debugImplementation "androidx.compose.ui:ui-tooling:1.6.8"
debugImplementation "androidx.compose.ui:ui-test-manifest:1.6.8"
}
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,6 @@ private fun BodyContent(
thumbnail = state.thumbnail,
modifier = Modifier.padding(start = 20.dp, end = 20.dp)
)
//Spacer(modifier = Modifier.fillMaxHeight())
// TODO: Button
DefaultButton(
onClick = startUpload,
modifier = Modifier
Expand Down
17 changes: 8 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
buildscript {
ext {
compose_ui_version = '1.5.3'
}
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '8.4.2' apply false
id 'com.android.library' version '8.4.2' apply false
id 'org.jetbrains.kotlin.android' version '1.9.24' apply false
id 'com.mux.gradle.android.mux-android-distribution' version '1.1.2' apply false
id 'com.android.application' version '8.5.2' apply false
id 'com.android.library' version '8.5.2' apply false
id 'org.jetbrains.kotlin.android' version '2.0.10' apply false
id 'org.jetbrains.kotlin.plugin.compose' version '2.0.10' apply false
id 'com.mux.gradle.android.mux-android-distribution' version '1.2.1' apply false
}

// a comment
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@ kotlin.code.style=official
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Jan 19 16:04:49 PST 2023
#Tue Aug 20 17:09:10 PDT 2024
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
16 changes: 9 additions & 7 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ plugins {

android {
namespace 'com.mux.video.upload'
compileSdk 34
compileSdk 35

defaultConfig {
minSdk 16
targetSdkVersion 34

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -29,14 +28,17 @@ android {
kotlinOptions {
jvmTarget = '1.8'
}
buildFeatures {
buildConfig true
}
}

muxDistribution {
devVersion versionFromCommitHash('dev-')
releaseVersion versionFromTag()
artifactIds just("upload")
groupIds just("com.mux.video")
publicReleaseIf releaseOnTag()
publicReleaseIf releaseIfCmdFlag("publicRelease")

packageJavadocs = true
packageSources = true
Expand Down Expand Up @@ -72,13 +74,13 @@ muxDistribution {
dependencies {
implementation "com.squareup.okhttp3:logging-interceptor:4.12.0"
implementation "com.squareup.okhttp3:okhttp:4.12.0"
implementation "io.github.crow-misia.libyuv:libyuv-android:0.29.0"
implementation "io.github.crow-misia.libyuv:libyuv-android:0.34.0"

implementation 'androidx.core:core-ktx:1.12.0'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
implementation 'androidx.core:core-ktx:1.13.1'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"

testImplementation 'junit:junit:4.13.2'
testImplementation 'androidx.test.ext:junit:1.1.5'
testImplementation 'androidx.test.ext:junit:1.2.1'
testImplementation "io.mockk:mockk:1.13.9"
testImplementation 'org.robolectric:robolectric:4.11.1'
}
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ internal class UploadMetrics private constructor() {
appContext.packageManager.getPackageInfo(appContext.packageName, 0)
}
appName = packageInfo.packageName
appVersion = packageInfo.versionName
appVersion = packageInfo.versionName ?: "unknown"
}
}
}
Loading