Skip to content

Commit

Permalink
Move AndroidManifest and resource files
Browse files Browse the repository at this point in the history
  • Loading branch information
LouisCAD committed Mar 17, 2019
1 parent 333e966 commit 7b113bf
Show file tree
Hide file tree
Showing 92 changed files with 12 additions and 14 deletions.
4 changes: 4 additions & 0 deletions buildSrc/src/main/kotlin/AndroidLibraryConfig.kt
Expand Up @@ -20,6 +20,10 @@ fun AndroidLibraryExtension.setDefaults() {
isMinifyEnabled = false
}
}
sourceSets.getByName("main") {
manifest.srcFile("src/androidMain/AndroidManifest.xml")
res.srcDir("src/androidMain/res")
}
// TODO replace with https://issuetracker.google.com/issues/72050365 once released.
libraryVariants.all(Action {
generateBuildConfigProvider.configure {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
15 changes: 2 additions & 13 deletions modules/typesaferecyclerview/build.gradle.kts
@@ -1,17 +1,5 @@
/*
* Copyright (c) 2018. Louis Cognault Ayeva Derman
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Copyright 2019 Louis Cognault Ayeva Derman. Use of this source code is governed by the Apache 2.0 license.
*/

plugins {
Expand All @@ -23,6 +11,7 @@ plugins {

android {
setDefaults()
sourceSets.getByName("main").java.srcDir("src/androidMain/java")
}

kotlin {
Expand Down
File renamed without changes.
File renamed without changes.
Expand Up @@ -26,7 +26,12 @@ import splitties.lifecycle.coroutines.PotentialFutureAndroidXLifecycleKtxApi
import splitties.lifecycle.coroutines.awaitState
import splitties.lifecycle.coroutines.coroutineScope
import splitties.views.centerText
import splitties.views.dsl.core.*
import splitties.views.dsl.core.add
import splitties.views.dsl.core.contentView
import splitties.views.dsl.core.frameLayout
import splitties.views.dsl.core.lParams
import splitties.views.dsl.core.margin
import splitties.views.dsl.core.textView
import splitties.views.gravityCenter
import splitties.views.textAppearance

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 7b113bf

Please sign in to comment.