Peertube
/
peertube-live-streaming
mirror of https://codeberg.org/Schoumi/PeerTubeLive.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'Bump versions for v1.2 release' (#56) from release-v1.2 into master 

Reviewed-on: https://codeberg.org/Schoumi/PeerTubeLive/pulls/56
This commit is contained in:
Schoumi 2024-05-17 09:30:45 +00:00
parent 24bcf9e026 8b26069bd9
commit 9e82b24cf5
9 changed files with 56 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/build.gradle
View File

@ -5,21 +5,15 @@ apply plugin: 'kotlin-kapt'
apply plugin: 'androidx.navigation.safeargs.kotlin'
android {
compileSdkVersion 32
buildToolsVersion "32.0.0"
compileSdkVersion 34
defaultConfig {
applicationId "fr.mobdev.peertubelive"
minSdkVersion 21
targetSdkVersion 32
versionCode 2
versionName "1.1"
targetSdkVersion 34
versionCode 3
versionName "1.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables
{
useSupportLibrary true
}
}
buildTypes {
@ -29,15 +23,16 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
buildFeatures {
dataBinding true
buildConfig true
}
namespace 'fr.mobdev.peertubelive'
@ -47,14 +42,14 @@ dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation project(':rtplibrary')
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.core:core-ktx:1.6.0'
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
}

5
app/src/main/java/fr/mobdev/peertubelive/activity/StreamActivity.kt
View File

@ -356,6 +356,11 @@ class StreamActivity : AppCompatActivity() {
width = 480
height = 360
}
null -> {
width = 1920
height = 1080
}
}
rtmpCamera2.startPreview(CameraHelper.Facing.BACK, width,height)

2
app/src/main/java/fr/mobdev/peertubelive/objects/StreamSettings.kt
View File

@ -52,7 +52,7 @@ class StreamSettings(
parcel.writeByte(if (nsfw) 1 else 0)
if (saveReplay!= null)
parcel.writeByte(if (saveReplay) 1 else 0)
parcel.writeInt(resolution?.ordinal!!)
parcel.writeInt(resolution.ordinal)
}
override fun describeContents(): Int {

8
build.gradle
View File

@ -1,6 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.6.21'
ext.kotlin_version = '1.9.22'
ext.rtsp_version_name = '2.1.9'
ext.rtsp_version_code = 219
repositories {
@ -8,9 +8,9 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.1'
classpath 'com.android.tools.build:gradle:8.3.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.4.2'
classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@ -25,6 +25,6 @@ allprojects {
}
}
task clean(type: Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}

10
encoder/build.gradle
View File

@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
apply plugin: 'maven-publish'
android {
compileSdkVersion 32
compileSdkVersion 34
defaultConfig {
minSdkVersion 16
targetSdkVersion 32
targetSdkVersion 34
}
buildTypes {
release {
@ -16,10 +16,14 @@ android {
}
}
namespace 'com.pedro.encoder'
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
}
dependencies {
api 'androidx.annotation:annotation:1.3.0'
api 'androidx.annotation:annotation:1.8.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Fri Feb 19 17:29:52 CET 2021
#Thu May 16 21:39:00 CEST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

8
rtmp/build.gradle
View File

@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
apply plugin: 'maven-publish'
android {
compileSdkVersion 32
compileSdkVersion 34
defaultConfig {
minSdkVersion 16
targetSdkVersion 32
targetSdkVersion 34
}
buildTypes {
release {
@ -15,6 +15,10 @@ android {
}
}
namespace 'com.pedro.rtmp'
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
}

8
rtplibrary/build.gradle
View File

@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
apply plugin: 'maven-publish'
android {
compileSdkVersion 32
compileSdkVersion 34
defaultConfig {
minSdkVersion 16
targetSdkVersion 32
targetSdkVersion 34
}
buildTypes {
release {
@ -16,6 +16,10 @@ android {
}
}
namespace 'com.pedro.rtplibrary'
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
}

11
rtsp/build.gradle
View File

@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
apply plugin: 'maven-publish'
android {
compileSdkVersion 32
compileSdkVersion 34
defaultConfig {
minSdkVersion 16
targetSdkVersion 32
targetSdkVersion 34
buildConfigField 'int', 'VERSION_CODE', "${rtsp_version_code}"
buildConfigField 'String', 'VERSION_NAME', "\"${rtsp_version_name}\""
}
@ -19,6 +19,13 @@ android {
}
namespace 'com.pedro.rtsp'
buildFeatures {
buildConfig true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
}