Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
QuasselDroid-ng
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Janne Mareike Koschinski
QuasselDroid-ng
Commits
d6650e90
Verified
Commit
d6650e90
authored
4 years ago
by
Janne Mareike Koschinski
Browse files
Options
Downloads
Patches
Plain Diff
Cleaning up dependencies
parent
55dc0bfe
No related branches found
No related tags found
1 merge request
!2
Draft: Jetpack compose rewrite
Pipeline
#566
failed
4 years ago
Stage: build
Stage: test
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
app/build.gradle.kts
+25
-17
25 additions, 17 deletions
app/build.gradle.kts
app/src/main/AndroidManifest.xml
+10
-0
10 additions, 0 deletions
app/src/main/AndroidManifest.xml
build.gradle.kts
+9
-2
9 additions, 2 deletions
build.gradle.kts
buildSrc/build.gradle.kts
+1
-1
1 addition, 1 deletion
buildSrc/build.gradle.kts
with
45 additions
and
20 deletions
app/build.gradle.kts
+
25
−
17
View file @
d6650e90
import
de.kuschku.justcode.properties
import
de.kuschku.justcode.signingData
plugins
{
plugins
{
id
(
"com.android.application"
)
id
(
"com.android.application"
)
id
(
"kotlin-android"
)
id
(
"kotlin-android"
)
id
(
"de.kuschku.justcode"
)
id
(
"de.kuschku.justcode"
)
}
}
val
composeVersion
:
String
by
extra
android
{
android
{
defaultConfig
{
defaultConfig
{
setMinSdkVersion
(
21
)
setMinSdkVersion
(
21
)
...
@@ -42,20 +37,33 @@ android {
...
@@ -42,20 +37,33 @@ android {
compose
=
true
compose
=
true
}
}
composeOptions
{
composeOptions
{
kotlinCompilerExtensionVersion
=
composeVersion
val
androidxComposeVersion
:
String
by
project
.
extra
kotlinCompilerExtensionVersion
=
androidxComposeVersion
}
}
}
}
dependencies
{
dependencies
{
implementation
(
"androidx.core:core-ktx:1.3.2"
)
val
androidxCoreVersion
:
String
by
project
.
extra
implementation
(
"androidx.appcompat:appcompat:1.2.0"
)
implementation
(
"androidx.core"
,
"core-ktx"
,
androidxCoreVersion
)
implementation
(
"com.google.android.material:material:1.2.1"
)
implementation
(
"androidx.compose.ui:ui:$composeVersion"
)
val
androidxAppcompatVersion
:
String
by
project
.
extra
implementation
(
"androidx.compose.material:material:$composeVersion"
)
implementation
(
"androidx.appcompat"
,
"appcompat"
,
androidxAppcompatVersion
)
implementation
(
"androidx.compose.ui:ui-tooling:$composeVersion"
)
implementation
(
"androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-rc01"
)
val
mdcVersion
:
String
by
project
.
extra
implementation
(
"com.google.android.material"
,
"material"
,
mdcVersion
)
testImplementation
(
"junit:junit:4.13.1"
)
androidTestImplementation
(
"androidx.test.ext:junit:1.1.2"
)
val
androidxComposeVersion
:
String
by
project
.
extra
androidTestImplementation
(
"androidx.test.espresso:espresso-core:3.3.0"
)
implementation
(
"androidx.compose.ui"
,
"ui"
,
androidxComposeVersion
)
implementation
(
"androidx.compose.material"
,
"material"
,
androidxComposeVersion
)
implementation
(
"androidx.compose.ui"
,
"ui-tooling"
,
androidxComposeVersion
)
val
androidxLifecycleVersion
:
String
by
project
.
extra
implementation
(
"androidx.lifecycle"
,
"lifecycle-runtime-ktx"
,
androidxLifecycleVersion
)
implementation
(
"io.coil-kt"
,
"coil"
,
"1.1.1"
)
implementation
(
"dev.chrisbanes.accompanist"
,
"accompanist-coil"
,
"0.5.0"
)
testImplementation
(
"junit"
,
"junit"
,
"4.13.1"
)
androidTestImplementation
(
"androidx.test.ext"
,
"junit"
,
"1.1.2"
)
androidTestImplementation
(
"androidx.test.espresso"
,
"espresso-core"
,
"3.3.0"
)
}
}
This diff is collapsed.
Click to expand it.
app/src/main/AndroidManifest.xml
+
10
−
0
View file @
d6650e90
...
@@ -2,6 +2,16 @@
...
@@ -2,6 +2,16 @@
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"de.kuschku.quasseldroid"
>
package=
"de.kuschku.quasseldroid"
>
<uses-feature
android:name=
"android.hardware.type.pc"
android:required=
"false"
/>
<uses-feature
android:name=
"android.hardware.touchscreen"
android:required=
"false"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
<application
<application
android:allowBackup=
"true"
android:allowBackup=
"true"
android:fullBackupContent=
"@xml/backup_descriptor"
android:fullBackupContent=
"@xml/backup_descriptor"
...
...
This diff is collapsed.
Click to expand it.
build.gradle.kts
+
9
−
2
View file @
d6650e90
...
@@ -20,18 +20,25 @@
...
@@ -20,18 +20,25 @@
buildscript
{
buildscript
{
repositories
{
repositories
{
google
()
google
()
mavenCentral
()
jcenter
()
jcenter
()
}
}
dependencies
{
dependencies
{
classpath
(
"com.android.tools.build:gradle:7.0.0-alpha05"
)
classpath
(
"com.android.tools.build:gradle:7.0.0-alpha05"
)
classpath
(
"org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21"
)
classpath
(
"org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21
-2
"
)
}
}
}
}
allprojects
{
allprojects
{
extra
[
"composeVersion"
]
=
"1.0.0-alpha08"
extra
[
"androidxAppcompatVersion"
]
=
"1.2.0"
extra
[
"androidxCoreVersion"
]
=
"1.2.0"
extra
[
"androidxComposeVersion"
]
=
"1.0.0-alpha11"
extra
[
"androidxLifecycleVersion"
]
=
"2.3.0-rc01"
extra
[
"mdcVersion"
]
=
"1.2.1"
repositories
{
repositories
{
google
()
google
()
mavenCentral
()
jcenter
()
jcenter
()
}
}
}
}
This diff is collapsed.
Click to expand it.
buildSrc/build.gradle.kts
+
1
−
1
View file @
d6650e90
...
@@ -32,7 +32,7 @@ repositories {
...
@@ -32,7 +32,7 @@ repositories {
dependencies
{
dependencies
{
implementation
(
"com.android.tools.build:gradle:7.0.0-alpha05"
)
implementation
(
"com.android.tools.build:gradle:7.0.0-alpha05"
)
implementation
(
"org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21"
)
implementation
(
"org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21
-2
"
)
implementation
(
gradleApi
())
implementation
(
gradleApi
())
implementation
(
localGroovy
())
implementation
(
localGroovy
())
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment