Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: CommonOpenSourceOrganization-Android/android-topeka
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: android/topeka
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 15 commits
  • 57 files changed
  • 10 contributors

Commits on May 3, 2018

  1. Use targetSdk for setting targetSdkVersion

    @liutikas
    liutikas authored May 3, 2018
    Configuration menu
    Copy the full SHA
    7f1dff5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request android#116 from liutikas/patch-1 

    Use targetSdk for setting targetSdkVersion
    @tjohns
    tjohns authored May 3, 2018
    Configuration menu
    Copy the full SHA
    683bf78 View commit details
    Browse the repository at this point in the history

  3. Update to a newer version of Gradle

    @liutikas
    liutikas authored May 3, 2018
    Configuration menu
    Copy the full SHA
    b9a1147 View commit details
    Browse the repository at this point in the history

  4. Merge pull request android#117 from liutikas/patch-2 

    Update to a newer version of Gradle
    @tjohns
    tjohns authored May 3, 2018
    Configuration menu
    Copy the full SHA
    e655497 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2018

  1. Fix drawable resource referencing 

    The referenced resources were moved around.
With the changes in instant apps package names
this requires some logic to have icons in both
installed and instant package names.

Change-Id: I6dd2cf18129e79e68014cb6e85474d7f20cca72e
    @keyboardsurfer
    keyboardsurfer committed May 8, 2018
    Configuration menu
    Copy the full SHA
    e588026 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2019

  1. README: correct link to blog post

    @SubhrajyotiSen @keyboardsurfer
    SubhrajyotiSen authored and keyboardsurfer committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    eed3c9e View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2020

  1. Migrate instant app to app model structure android#124 

    * Remove com.android.feature plugin
* Remove modules and flavors unnecessary
* Add com.android.dynamic-feature plugin
    @keyboardsurfer
    keyboardsurfer committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    6e105ff View commit details
    Browse the repository at this point in the history

  2. Update dependencies to androidx

    @keyboardsurfer
    keyboardsurfer committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    c9b3bdf View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2020

  1. Fixed image resource crash in CheckableFab.

    @anikiki @keyboardsurfer
    anikiki authored and keyboardsurfer committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    9972ca8 View commit details
    Browse the repository at this point in the history

  2. Removed unneeded IntArray.

    @anikiki @keyboardsurfer
    anikiki authored and keyboardsurfer committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    5943c3f View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2020

  1. Add GitHub Actions workflow 

    This enables automatic builds for new commits and PRs in the master branch.
This sample is currently **green**, see build logs:

+ GRADLE_OPTS=' -Xms4g -Xmx4g'
+ GRADLE_OPTS=' -Xms4g -Xmx4g -XX:+HeapDumpOnOutOfMemoryError'
+ GRADLE_OPTS=' -Xms4g -Xmx4g -XX:+HeapDumpOnOutOfMemoryError -Dorg.gradle.daemon=false'
+ GRADLE_OPTS=' -Xms4g -Xmx4g -XX:+HeapDumpOnOutOfMemoryError -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2'
+ GRADLE_OPTS=' -Xms4g -Xmx4g -XX:+HeapDumpOnOutOfMemoryError -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2 -Dkotlin.incremental=false'
+ GRADLE_OPTS=' -Xms4g -Xmx4g -XX:+HeapDumpOnOutOfMemoryError -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2 -Dkotlin.incremental=false -Dkotlin.compiler.execution.strategy=in-process'
+ GRADLE_OPTS=' -Xms4g -Xmx4g -XX:+HeapDumpOnOutOfMemoryError -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2 -Dkotlin.incremental=false -Dkotlin.compiler.execution.strategy=in-process -Dfile.encoding=UTF-8'
+ export GRADLE_OPTS
++ find . -name gradlew
+ for GRADLEW in '`find . -name "gradlew"`'
++ dirname ./gradlew
+ SAMPLE=.
+ bash ./gradlew -p . -Pci --no-parallel --stacktrace assembleDebug
Downloading https://services.gradle.org/distributions/gradle-6.0-all.zip
...................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
Unzipping /Users/owahltinez/.gradle/wrapper/dists/gradle-6.0-all/cra2s42cvogxluqqpvbc5e9xd/gradle-6.0-all.zip to /Users/owahltinez/.gradle/wrapper/dists/gradle-6.0-all/cra2s42cvogxluqqpvbc5e9xd
Set executable permissions for: /Users/owahltinez/.gradle/wrapper/dists/gradle-6.0-all/cra2s42cvogxluqqpvbc5e9xd/gradle-6.0/bin/gradle

Welcome to Gradle 6.0!

Here are the highlights of this release:
 - Substantial improvements in dependency management, including
   - Publishing Gradle Module Metadata in addition to pom.xml
   - Advanced control of transitive versions
   - Support for optional features and dependencies
   - Rules to tweak published metadata
 - Support for Java 13
 - Faster incremental Java and Groovy compilation
 - New Zinc compiler for Scala
 - VS2019 support
 - Support for Gradle Enterprise plugin 3.0

For more details see https://docs.gradle.org/6.0/release-notes.html

To honour the JVM settings for this build a new JVM will be forked. Please consider using the daemon: https://docs.gradle.org/6.0/userguide/gradle_daemon.html.
Daemon will be stopped at the end of the build stopping after processing
> Task :app:generateDebugFeatureTransitiveDeps
> Task :categories:generateDebugFeatureTransitiveDeps
> Task :quiz:generateDebugFeatureTransitiveDeps
> Task :app:checkDebugLibraries
> Task :app:preBuild UP-TO-DATE
> Task :app:preDebugBuild
> Task :base:preBuild UP-TO-DATE
> Task :base:preDebugBuild UP-TO-DATE
> Task :base:compileDebugAidl NO-SOURCE
> Task :app:compileDebugAidl NO-SOURCE
> Task :base:packageDebugRenderscript NO-SOURCE
> Task :app:generateDebugBuildConfig
> Task :app:compileDebugRenderscript NO-SOURCE
> Task :app:mainApkListPersistenceDebug
> Task :app:generateDebugResValues
> Task :app:generateDebugResources
> Task :base:compileDebugRenderscript NO-SOURCE
> Task :base:generateDebugResValues
> Task :base:generateDebugResources
> Task :base:packageDebugResources
> Task :app:createDebugCompatibleScreenManifests
> Task :app:extractDeepLinksDebug
> Task :base:extractDeepLinksDebug
> Task :base:processDebugManifest
> Task :categories:preBuild UP-TO-DATE
> Task :categories:preDebugBuild UP-TO-DATE
> Task :categories:featureDebugWriter
> Task :quiz:preBuild UP-TO-DATE
> Task :quiz:preDebugBuild UP-TO-DATE
> Task :quiz:featureDebugWriter
> Task :app:generateDebugFeatureMetadata
> Task :app:writeDebugModuleMetadata
> Task :categories:mainApkListPersistenceDebug
> Task :categories:createDebugCompatibleScreenManifests
> Task :categories:extractDeepLinksDebug
> Task :categories:processDebugManifest
> Task :app:mergeDebugResources
> Task :quiz:mainApkListPersistenceDebug
> Task :quiz:createDebugCompatibleScreenManifests
> Task :quiz:extractDeepLinksDebug
> Task :quiz:processDebugManifest
> Task :app:processDebugManifest
> Task :base:compileDebugLibraryResources
> Task :base:parseDebugLocalResources
> Task :base:generateDebugRFile
> Task :app:processDebugResources
> Task :base:generateDebugBuildConfig

> Task :base:compileDebugKotlin
w: /Users/owahltinez/Sandbox/samples/topeka/base/src/main/java/com/google/samples/apps/topeka/helper/CredentialsHelper.kt: (102, 41): Type mismatch: inferred type is Credential? but Credential was expected
w: /Users/owahltinez/Sandbox/samples/topeka/base/src/main/java/com/google/samples/apps/topeka/helper/ParcelExtensions.kt: (26, 12): Extension is shadowed by a member: public open fun writeBoolean(p0: Boolean): Unit
w: /Users/owahltinez/Sandbox/samples/topeka/base/src/main/java/com/google/samples/apps/topeka/helper/ParcelExtensions.kt: (31, 12): Extension is shadowed by a member: public open fun readBoolean(): Boolean
w: /Users/owahltinez/Sandbox/samples/topeka/base/src/main/java/com/google/samples/apps/topeka/helper/ViewExtensions.kt: (71, 31): The corresponding parameter in the supertype 'IntProperty' is named 'type'. This may cause problems when calling this function with named arguments.
w: /Users/owahltinez/Sandbox/samples/topeka/base/src/main/java/com/google/samples/apps/topeka/helper/ViewExtensions.kt: (71, 47): The corresponding parameter in the supertype 'IntProperty' is named 'value'. This may cause problems when calling this function with named arguments.
w: /Users/owahltinez/Sandbox/samples/topeka/base/src/main/java/com/google/samples/apps/topeka/helper/ViewExtensions.kt: (86, 31): The corresponding parameter in the supertype 'FloatProperty' is named 'type'. This may cause problems when calling this function with named arguments.
w: /Users/owahltinez/Sandbox/samples/topeka/base/src/main/java/com/google/samples/apps/topeka/helper/ViewExtensions.kt: (86, 47): The corresponding parameter in the supertype 'FloatProperty' is named 'value'. This may cause problems when calling this function with named arguments.
w: /Users/owahltinez/Sandbox/samples/topeka/base/src/main/java/com/google/samples/apps/topeka/helper/ViewExtensions.kt: (96, 31): The corresponding parameter in the supertype 'IntProperty' is named 'type'. This may cause problems when calling this function with named arguments.
w: /Users/owahltinez/Sandbox/samples/topeka/base/src/main/java/com/google/samples/apps/topeka/helper/ViewExtensions.kt: (116, 31): The corresponding parameter in the supertype 'IntProperty' is named 'type'. This may cause problems when calling this function with named arguments.
w: /Users/owahltinez/Sandbox/samples/topeka/base/src/main/java/com/google/samples/apps/topeka/model/Player.kt: (47, 43): Elvis operator (?:) always returns the left operand of non-nullable type String
w: /Users/owahltinez/Sandbox/samples/topeka/base/src/main/java/com/google/samples/apps/topeka/persistence/TopekaDatabaseHelper.kt: (149, 33): Type mismatch: inferred type is Nothing? but String was expected
w: /Users/owahltinez/Sandbox/samples/topeka/base/src/main/java/com/google/samples/apps/topeka/persistence/TopekaDatabaseHelper.kt: (149, 38): Unnecessary safe call on a non-null receiver of type String!
w: /Users/owahltinez/Sandbox/samples/topeka/base/src/main/java/com/google/samples/apps/topeka/persistence/TopekaDatabaseHelper.kt: (358, 61): Unnecessary non-null assertion (!!) on a non-null receiver of type Int

> Task :base:javaPreCompileDebug
> Task :base:compileDebugJavaWithJavac
> Task :base:bundleLibCompileDebug
> Task :app:compileDebugKotlin
> Task :app:javaPreCompileDebug
> Task :app:compileDebugJavaWithJavac
> Task :app:compileDebugSources
> Task :app:mergeDebugShaders
> Task :app:compileDebugShaders
> Task :app:generateDebugAssets
> Task :base:mergeDebugShaders
> Task :base:compileDebugShaders
> Task :base:generateDebugAssets
> Task :base:packageDebugAssets
> Task :app:mergeDebugAssets
> Task :app:processDebugJavaRes NO-SOURCE
> Task :base:processDebugJavaRes NO-SOURCE
> Task :base:bundleLibResDebug
> Task :base:bundleLibRuntimeDebug
> Task :app:mergeDebugJavaResource
> Task :app:dexBuilderDebug
> Task :app:checkDebugDuplicateClasses
> Task :app:mergeDebugJniLibFolders
> Task :base:mergeDebugJniLibFolders
> Task :base:mergeDebugNativeLibs
> Task :base:stripDebugDebugSymbols
> Task :base:copyDebugJniLibsProjectOnly
> Task :app:mergeDebugNativeLibs
> Task :app:stripDebugDebugSymbols
> Task :app:validateSigningDebug
> Task :base:copyDebugJniLibsProjectAndLocalJars
> Task :base:extractDebugAnnotations
> Task :base:mergeDebugGeneratedProguardFiles
> Task :base:mergeDebugConsumerProguardFiles
> Task :base:prepareLintJarForPublish
> Task :base:mergeDebugJavaResource
> Task :base:syncDebugLibJars
> Task :base:bundleDebugAar
> Task :base:compileDebugSources
> Task :base:assembleDebug
> Task :app:bundleDebugClasses
> Task :categories:compileDebugAidl NO-SOURCE
> Task :categories:compileDebugRenderscript NO-SOURCE
> Task :categories:generateDebugBuildConfig
> Task :categories:generateDebugResValues
> Task :categories:generateDebugResources
> Task :categories:mergeDebugResources
> Task :categories:processDebugResources

> Task :categories:compileDebugKotlin
w: /Users/owahltinez/Sandbox/samples/topeka/categories/src/main/java/com/google/samples/apps/topeka/fragment/CategorySelectionFragment.kt: (81, 40): Type mismatch: inferred type is String? but String was expected

> Task :app:mergeExtDexDebug
> Task :categories:javaPreCompileDebug
> Task :categories:compileDebugJavaWithJavac
> Task :categories:compileDebugSources
> Task :app:signingConfigWriterDebug
> Task :categories:mergeDebugShaders
> Task :categories:compileDebugShaders
> Task :categories:generateDebugAssets
> Task :categories:mergeDebugAssets
> Task :categories:processDebugJavaRes NO-SOURCE
> Task :categories:mergeDebugJavaResource
> Task :categories:checkDebugDuplicateClasses
> Task :categories:mergeExtDexDebug
> Task :categories:mergeLibDexDebug
> Task :categories:dexBuilderDebug
> Task :categories:mergeProjectDexDebug
> Task :categories:mergeDebugJniLibFolders
> Task :categories:mergeDebugNativeLibs
> Task :categories:stripDebugDebugSymbols
> Task :categories:packageDebug
> Task :categories:assembleDebug
> Task :quiz:compileDebugAidl NO-SOURCE
> Task :quiz:compileDebugRenderscript NO-SOURCE
> Task :quiz:generateDebugBuildConfig
> Task :quiz:generateDebugResValues
> Task :quiz:generateDebugResources
> Task :quiz:mergeDebugResources
> Task :quiz:processDebugResources
> Task :quiz:compileDebugKotlin
> Task :app:mergeDexDebug
> Task :app:packageDebug
> Task :app:assembleDebug
> Task :quiz:javaPreCompileDebug
> Task :quiz:compileDebugJavaWithJavac
> Task :quiz:compileDebugSources
> Task :quiz:mergeDebugShaders
> Task :quiz:compileDebugShaders
> Task :quiz:generateDebugAssets
> Task :quiz:mergeDebugAssets
> Task :quiz:processDebugJavaRes NO-SOURCE
> Task :quiz:mergeDebugJavaResource
> Task :quiz:checkDebugDuplicateClasses
> Task :quiz:mergeLibDexDebug
> Task :quiz:dexBuilderDebug
> Task :quiz:mergeExtDexDebug
> Task :quiz:mergeDebugJniLibFolders
> Task :quiz:mergeDebugNativeLibs
> Task :quiz:stripDebugDebugSymbols
> Task :quiz:mergeProjectDexDebug
> Task :quiz:packageDebug
> Task :quiz:assembleDebug

BUILD SUCCESSFUL in 3m 15s
112 actionable tasks: 112 executed
    @owahltinez
    owahltinez committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    ef08b07 View commit details
    Browse the repository at this point in the history

  2. Merge pull request android#128 from android/github-actions 

    Add GitHub Actions workflow
    @owahltinez
    owahltinez authored Apr 15, 2020
    Configuration menu
    Copy the full SHA
    aae8af2 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2020

  1. updated kotlin_version, gradle, cleaned up some code

    @GeorgCantor
    GeorgCantor committed Sep 5, 2020
    Configuration menu
    Copy the full SHA
    df5a539 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2020

  1. Create copy-branch.yml

    @codingjeremy
    codingjeremy authored Sep 28, 2020
    Configuration menu
    Copy the full SHA
    7e8beb2 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2021

  1. Merge pull request android#133 from GeorgCantor/master 

    Updated kotlin_version, gradle, cleaned up some code
    @ggfan
    ggfan authored Jan 22, 2021
    Configuration menu
    Copy the full SHA
    4073703 View commit details
    Browse the repository at this point in the history
Loading