Skip to content

Commit 777c865

Browse files
natario1natario1
committed
Change package, upgrade
1 parent ab93fc6 commit 777c865

File tree

22 files changed

+39
-58
lines changed

22 files changed

+39
-58
lines changed

‎.github/FUNDING.yml‎

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

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Build
44
on:
55
push:
66
branches:
7-
- master
7+
- main
88
pull_request:
99
jobs:
1010
BASE_CHECKS:

‎.idea/compiler.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111

1212
dependencies {
1313
classpath("io.deepmedia.tools:publisher:0.4.0")
14-
classpath("com.otaliastudios.tools:grease:0.1.0") {
14+
classpath("io.deepmedia.tools:grease:0.2.0") {
1515
isChanging = true
1616
}
1717
}

‎grease/build.gradle.kts‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
/*
2-
* Copyright (c) 2020 Otalia Studios. Author: Mattia Iavarone.
3-
*/
4-
5-
import com.otaliastudios.tools.publisher.common.*
1+
import io.deepmedia.tools.publisher.common.*
62

73
plugins {
84
`kotlin-dsl`
9-
id("com.otaliastudios.tools.publisher")
5+
id("io.deepmedia.tools.publisher")
106
}
117

128
dependencies {
13-
api("com.android.tools.build:gradle:4.0.1") // android gradle plugin
9+
api("com.android.tools.build:gradle:4.1.1") // android gradle plugin
1410
api(gradleApi()) // gradle
1511
api(gradleKotlinDsl()) // not sure if needed
1612
api(localGroovy()) // groovy
@@ -19,11 +15,11 @@ dependencies {
1915
publisher {
2016
project.name = "Grease"
2117
project.artifact = "grease"
22-
project.description = "Fat and shaded AARs for Android."
23-
project.group = "com.otaliastudios.tools"
24-
project.url = "https://github.com/natario1/Grease"
25-
project.vcsUrl = "https://github.com/natario1/Grease.git"
26-
release.version = "0.1.2"
18+
project.description = "Fat AARs for Android."
19+
project.group = "io.deepmedia.tools"
20+
project.url = "https://github.com/deepmedia/Grease"
21+
project.vcsUrl = "https://github.com/deepmedia/Grease.git"
22+
release.version = "0.2.0"
2723
// release.setSources(Release.SOURCES_AUTO)
2824
// release.setDocs(Release.DOCS_AUTO)
2925
directory {

grease/src/main/kotlin/com/otaliastudios/tools/grease/GreasePlugin.kt renamed to grease/src/main/kotlin/io/deepmedia/tools/grease/GreasePlugin.kt

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
@file:Suppress("UnstableApiUsage")
22

3-
package com.otaliastudios.tools.grease
3+
package io.deepmedia.tools.grease
44

55
import com.android.build.gradle.LibraryExtension
66
import com.android.build.gradle.api.LibraryVariant
77
import com.android.build.gradle.api.LibraryVariantOutput
8-
import com.android.build.gradle.internal.ApplicationTaskManager
98
import com.android.build.gradle.internal.LibraryTaskManager
109
import com.android.build.gradle.internal.LoggerWrapper
1110
import com.android.build.gradle.internal.TaskManager
@@ -18,8 +17,6 @@ import com.android.build.gradle.internal.tasks.*
1817
import com.android.build.gradle.internal.tasks.factory.TaskCreationAction
1918
import com.android.build.gradle.internal.tasks.manifest.mergeManifestsForApplication
2019
import com.android.build.gradle.tasks.*
21-
import com.android.builder.compiling.BuildConfigGenerator
22-
import com.android.builder.compiling.ResValueGenerator
2320
import com.android.manifmerger.ManifestMerger2
2421
import com.android.manifmerger.ManifestProvider
2522
import org.gradle.api.Plugin
@@ -140,16 +137,13 @@ open class GreasePlugin : Plugin<Project> {
140137
/* The merged flavor represents all flavors plus the default config. */
141138
versionCode = variant.mergedFlavor.versionCode ?: 1, // Should we inspect the buildType as well?
142139
versionName = variant.mergedFlavor.versionName ?: "", // Should we inspect the buildType as well?
143-
minSdkVersion = variant.mergedFlavor.minSdkVersion.apiString,
144-
targetSdkVersion = variant.mergedFlavor.targetSdkVersion.apiString,
140+
minSdkVersion = variant.mergedFlavor.minSdkVersion?.apiString,
141+
targetSdkVersion = variant.mergedFlavor.targetSdkVersion?.apiString,
145142
maxSdkVersion = variant.mergedFlavor.maxSdkVersion,
146143
/* The output destination */
147-
outManifestLocation = primaryManifest.get().absolutePath,
144+
outMergedManifestLocation = primaryManifest.get().absolutePath,
148145
/* Extra outputs that can probably be null. */
149146
outAaptSafeManifestLocation = null,
150-
outMetadataFeatureManifestLocation = null,
151-
outBundleManifestLocation = null,
152-
outInstantAppManifestLocation = null,
153147
/* Either LIBRARY or APPLICATION. When using LIBRARY we can't add lib dependencies */
154148
mergeType = if (true) ManifestMerger2.MergeType.APPLICATION else ManifestMerger2.MergeType.LIBRARY,
155149
/* Manifest placeholders. Doing this the way the library manifest does. */

grease/src/main/kotlin/com/otaliastudios/tools/grease/Logger.kt renamed to grease/src/main/kotlin/io/deepmedia/tools/grease/Logger.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.otaliastudios.tools.grease
1+
package io.deepmedia.tools.grease
22

33
import org.gradle.api.Project
44
import org.gradle.api.logging.LogLevel

grease/src/main/kotlin/com/otaliastudios/tools/grease/configurations.kt renamed to grease/src/main/kotlin/io/deepmedia/tools/grease/configurations.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.otaliastudios.tools.grease
1+
package io.deepmedia.tools.grease
22

33
import com.android.build.api.attributes.BuildTypeAttr
44
import com.android.build.gradle.api.LibraryVariant

grease/src/main/kotlin/com/otaliastudios/tools/grease/debug.kt renamed to grease/src/main/kotlin/io/deepmedia/tools/grease/debug.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.otaliastudios.tools.grease
1+
package io.deepmedia.tools.grease
22

33
import com.android.build.gradle.internal.res.GenerateLibraryRFileTask
44
import com.android.build.gradle.internal.res.ParseLibraryResourcesTask
@@ -50,8 +50,8 @@ internal fun debugResourcesTasks(target: Project, logger: Logger) {
5050
is GenerateLibraryRFileTask -> doFirst {
5151
log.i { "localResourcesFile (i): ${task.localResourcesFile.orNull}" }
5252
log.i { "dependencies (i): ${task.dependencies.files.joinToString()}" }
53-
log.i { "sourceOutputDirectory (o): ${task.sourceOutputDirectory.orNull}" }
5453
log.i { "rClassOutputJar (o): ${task.rClassOutputJar.orNull}" }
54+
log.i { "sourceOutputDir (o): ${task.sourceOutputDir}" }
5555
log.i { "textSymbolOutputFileProperty (o): ${task.textSymbolOutputFileProperty.orNull}" }
5656
log.i { "symbolsWithPackageNameOutputFile (o): ${task.symbolsWithPackageNameOutputFile.orNull}" }
5757
log.i { "symbolsWithPackageNameOutputFile (o): ${task.symbolsWithPackageNameOutputFile.orNull}" }
@@ -62,11 +62,11 @@ internal fun debugResourcesTasks(target: Project, logger: Logger) {
6262
}
6363
is GenerateBuildConfig -> doFirst {
6464
log.i { "mergedManifests (i): ${task.mergedManifests.orNull}" } // empty
65-
log.i { "itemValues (i): ${task.itemValues.joinToString()}" } // empty
65+
log.i { "items (i): ${task.items.orNull}" } // empty
6666
log.i { "sourceOutputDir (o): ${task.sourceOutputDir}" } // generated/source/<VARIANT>. contains the BuildConfig file
6767
}
6868
is GenerateResValues -> doFirst {
69-
log.i { "itemValues (i): ${task.getItemValues().joinToString()}" } // empty
69+
log.i { "items (i): ${task.items.orNull}" } // empty
7070
log.i { "resOutputDir (o): ${task.resOutputDir}" } // generated/res/resValues/<VARIANT>. nothing there for now
7171
}
7272
is MergeResources -> doFirst {

0 commit comments

Comments
 (0)