Skip to content

Commit 26b9bb0

Browse files
authored
Merge pull request #369 from HaishinKit/feature/bump-to-up-compile-sdk36
Bump to up compile sdk36
2 parents d2c560c + 23ff31f commit 26b9bb0

File tree

8 files changed

+21
-28
lines changed

8 files changed

+21
-28
lines changed

.idea/deploymentTargetSelector.xml

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

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ plugins {
66

77
android {
88
namespace = "com.haishinkit.app"
9-
compileSdk = 35
9+
compileSdk = 36
1010

1111
defaultConfig {
1212
applicationId = "com.haishinkit.app"
1313
minSdk = 21
14-
targetSdk = 35
14+
targetSdk = 36
1515
versionCode = 1
1616
versionName = "1.0"
1717

app/src/main/java/com/haishinkit/app/MediaProjectionService.kt

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,18 @@ class MediaProjectionService :
118118
launch {
119119
mixer.attachAudio(0, AudioRecordSource(applicationContext))
120120
intent?.getParcelableExtra<Intent>(EXTRA_RESULT_DATA)?.let {
121-
val source =
122-
MediaProjectionSource(
123-
applicationContext,
124-
mediaProjectionManager.getMediaProjection(Activity.RESULT_OK, it),
125-
)
126-
mixer.attachVideo(0, source).onSuccess {
127-
Log.i(TAG, "${source.video.videoSize}")
128-
mixer.screen.frame =
129-
Rect(0, 0, source.video.videoSize.width, source.video.videoSize.height)
130-
session.connect(StreamSession.Method.INGEST)
121+
mediaProjectionManager.getMediaProjection(Activity.RESULT_OK, it)?.let {
122+
val source =
123+
MediaProjectionSource(
124+
applicationContext,
125+
it,
126+
)
127+
mixer.attachVideo(0, source).onSuccess {
128+
Log.i(TAG, "${source.video.videoSize}")
129+
mixer.screen.frame =
130+
Rect(0, 0, source.video.videoSize.width, source.video.videoSize.height)
131+
session.connect(StreamSession.Method.INGEST)
132+
}
131133
}
132134
}
133135
}
@@ -178,6 +180,7 @@ class MediaProjectionService :
178180
return this
179181
}
180182

181-
fun isRunning(context: Context): Boolean = LocalBroadcastManager.getInstance(context).sendBroadcast(Intent(ACTION_SERVICE_RUNNING))
183+
fun isRunning(context: Context): Boolean =
184+
LocalBroadcastManager.getInstance(context).sendBroadcast(Intent(ACTION_SERVICE_RUNNING))
182185
}
183186
}

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010
}
1111

1212
rootProject.ext["PUBLISH_GROUP_ID"] = "com.github.HaishinKit"
13-
rootProject.ext["PUBLISH_VERSION"] = "0.14.2"
13+
rootProject.ext["PUBLISH_VERSION"] = "0.16.0"
1414

1515
subprojects {
1616
apply(plugin = "org.jlleitschuh.gradle.ktlint")

compose/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88

99
android {
1010
namespace = "com.haishinkit.compose"
11-
compileSdk = 35
11+
compileSdk = 36
1212

1313
defaultConfig {
1414
minSdk = 21

haishinkit/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77

88
android {
99
namespace = "com.haishinkit"
10-
compileSdk = 35
10+
compileSdk = 36
1111

1212
defaultConfig {
1313
minSdk = 21

lottie/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77

88
android {
99
namespace = "com.haishinkit.lottie"
10-
compileSdk = 35
10+
compileSdk = 36
1111

1212
defaultConfig {
1313
minSdk = 21

rtmp/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77

88
android {
99
namespace = "com.haishinkit.rtmp"
10-
compileSdk = 35
10+
compileSdk = 36
1111
defaultConfig {
1212
minSdk = 21
1313

0 commit comments

Comments
 (0)