Skip to content

Commit a7c89b3

Browse files
committed
feat: upgrade AGP, KGP & Gradle version
1 parent 61ffdf4 commit a7c89b3

File tree

5 files changed

+8
-16
lines changed

5 files changed

+8
-16
lines changed

demo/build.gradle

-4
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,8 @@ android {
2020
}
2121

2222
dependencies {
23-
implementation fileTree(dir: 'libs', include: ['*.jar'])
2423
implementation SAMPLE_APPCOMPAT_LIB
2524
implementation DESIGN_LIB
26-
testImplementation 'junit:junit:4.12'
27-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
28-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
2925

3026
implementation project(path: ':library:scene')
3127
implementation project(path: ':library:scene_ui')

gradle.properties

+3-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ org.gradle.jvmargs=-Xmx1536m
1616
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1717
# org.gradle.parallel=true
1818

19-
android.useDeprecatedNdk = true
2019
android.useAndroidX=true
2120
android.enableJetifier=false
2221

@@ -25,10 +24,10 @@ MIN_SDK_VERSION = 21
2524
TARGET_SDK_VERSION = 30
2625
COMPILE_SDK_VERSION = 30
2726

28-
KOTLIN_LIB = org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21
29-
KOTLIN_PLUGIN = org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21
27+
KOTLIN_LIB = org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.21
28+
KOTLIN_PLUGIN = org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.21
3029

31-
ANDROID_GRADLE_PLUGIN = com.android.tools.build:gradle:3.6.0
30+
ANDROID_GRADLE_PLUGIN = com.android.tools.build:gradle:7.4.2
3231

3332
APPCOMPAT_LIB = androidx.appcompat:appcompat:1.0.0
3433
CORE_LIB = androidx.core:core:1.5.0
@@ -42,8 +41,6 @@ SAVED_STATE_LIB = androidx.savedstate:savedstate:1.1.0
4241
INTERPOLATOR_LIB = androidx.interpolator:interpolator:1.0.0
4342

4443
## unit test dependency
45-
android.enableUnitTestBinaryResources=true
46-
android.jetifier.blacklist=bcprov
4744
ROBOLECTRIC = org.robolectric:robolectric:4.12.2
4845
AUTO_SERVICE = com.google.auto.service:auto-service:1.0-rc4
4946
JUNIT = junit:junit:4.13.2
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Tue Sep 17 18:31:25 CST 2019
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

library/scene_ktx/src/test/java/com/bytedance/scene/ktx/SceneExtensionsTests.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import android.view.View
88
import android.view.ViewGroup
99
import com.bytedance.scene.Scene
1010
import com.bytedance.scene.ktx.utility.TestActivity
11-
import com.bytedance.scene.ktx.utility.TestAppCompatActivity
11+
import com.bytedance.scene.ktx.utility.TestFragmentActivity
1212
import org.junit.Assert.*
1313
import org.junit.Test
1414
import org.junit.runner.RunWith
@@ -184,7 +184,7 @@ class SceneExtensionsTests {
184184
return View(requireSceneContext())
185185
}
186186
}
187-
val manager = createFromInitSceneLifecycleManager(TestAppCompatActivity::class.java, scene).first
187+
val manager = createFromInitSceneLifecycleManager(TestFragmentActivity::class.java, scene).first
188188
assertNotNull(scene.fragmentActivity())
189189
assertNotNull(scene.requireFragmentActivity())
190190
}

library/scene_ktx/src/test/java/com/bytedance/scene/ktx/utility/TestAppCompatActivity.kt library/scene_ktx/src/test/java/com/bytedance/scene/ktx/utility/TestFragmentActivity.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ package com.bytedance.scene.ktx.utility
22

33
import android.os.Bundle
44
import android.widget.FrameLayout
5-
import androidx.appcompat.app.AppCompatActivity
5+
import androidx.fragment.app.FragmentActivity
66

7-
class TestAppCompatActivity : AppCompatActivity() {
7+
class TestFragmentActivity : FragmentActivity() {
88
lateinit var mFrameLayout: FrameLayout
99

1010
override fun onCreate(savedInstanceState: Bundle?) {
11-
setTheme(com.bytedance.scene.ktx.R.style.Theme_AppCompat)
1211
super.onCreate(savedInstanceState)
1312
mFrameLayout = FrameLayout(this)
1413
setContentView(mFrameLayout)

0 commit comments

Comments
 (0)