summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge (-s ours) branch 'release-1.3'HEADmasterTavian Barnes2015-10-250-0/+0
|\
| * Bump the version to 1.3.1.release-1.3Tavian Barnes2015-10-258-8/+8
|/
* Update log4j javadoc URL.Tavian Barnes2015-10-251-1/+1
* Bump plugin versions.Tavian Barnes2015-10-251-5/+5
* Merge branch 'lazy-fixes'Tavian Barnes2015-07-1011-118/+147
|\
| * lazy: Fix Lazy<T> when a provider returns null.Tavian Barnes2015-07-102-5/+33
| * lazy: Fix LazyBinder de-duplication.Tavian Barnes2015-07-102-110/+111
| * Bump the version to 1.3.1-SNAPSHOT.Tavian Barnes2015-07-098-8/+8
|/
* Merge branch 'release-1.3'Tavian Barnes2015-05-080-0/+0
|\
| * Bump the version to 1.3.1.3Tavian Barnes2015-05-088-8/+8
|/
* Merge branch 'update-dependencies'Tavian Barnes2015-05-083-19/+19
|\
| * Update Maven plugins.Tavian Barnes2015-05-081-9/+9
| * Update Log4j to 2.2.Tavian Barnes2015-05-081-2/+2
| * Update SLF4J to 1.7.12.Tavian Barnes2015-05-081-2/+2
| * Update Mockito to 1.10.19.Tavian Barnes2015-05-081-3/+3
| * Update JUnit to 4.12.Tavian Barnes2015-05-081-3/+3
|/
* Merge branch 'guice-4-release'Tavian Barnes2015-05-0610-40/+42
|\
| * log4j: Add missing JavaDoc on test.Tavian Barnes2015-05-061-0/+2
| * slf4j, log4j: Fix some tests that "broke" due to Guice fixes.Tavian Barnes2015-05-062-24/+28
| * Use the Guice 4 release (and BOM).Tavian Barnes2015-05-061-8/+4
| * Bump the version to 1.3-SNAPSHOT.Tavian Barnes2015-05-068-8/+8
|/
* Merge branch 'circleci'Tavian Barnes2014-12-081-0/+3
|\
| * Add a circle.yml file.Tavian Barnes2014-12-081-0/+3
|/
* Update dependencies.Tavian Barnes2014-11-012-5/+5
* Use explicit versions for all plugins.Tavian Barnes2014-11-011-7/+49
* Use the nexus staging Maven plugin.Tavian Barnes2014-11-011-8/+19
* contextual: Avoid injecting the injector in ProviderKeyAdapter.Tavian Barnes2014-10-161-13/+10
* Merge branch 'release-1.2'Tavian Barnes2014-10-040-0/+0
|\
| * Bump the version to 1.2.1.2Tavian Barnes2014-10-048-8/+8
|/
* test: Add missing license headers.Tavian Barnes2014-10-044-0/+68
* Merge branch 'test'Tavian Barnes2014-10-0420-33/+410
|\
| * lazy: Test best practices.Tavian Barnes2014-10-044-24/+51
| * log4j: Test best practices.Tavian Barnes2014-10-043-2/+15
| * slf4j: Test best practices.Tavian Barnes2014-10-043-2/+15
| * contextual: Make ContextSensitiveBinder work with requireExplicitBindings().Tavian Barnes2014-10-043-3/+42
| * test: New sangria-test project.Tavian Barnes2014-10-047-0/+285
| * Upgrade Guice dependency to 4.0-beta5.Tavian Barnes2014-10-041-2/+2
* | core: Make PrettyTypes use PotentialAnnotation to format annotations.Tavian Barnes2014-09-251-8/+4
|/
* lazy: Make package-info.java consistent.Tavian Barnes2014-09-161-1/+1
* Merge branch 'upgrade-dependencies'Tavian Barnes2014-09-154-18/+16
|\
| * Update JavaDoc links.Tavian Barnes2014-09-151-8/+8
| * Don't use Guava's Objects.Tavian Barnes2014-09-152-6/+4
| * Bump dependency versions.Tavian Barnes2014-09-152-4/+4
|/
* core: Fix javadoc on PotentialAnnotation.from(Key<?>).Tavian Barnes2014-09-151-1/+4
* Merge branch 'lazy'Tavian Barnes2014-09-1519-16/+1079
|\
| * lazy: Better maven module description.Tavian Barnes2014-09-151-1/+1
| * lazy: Add LazySingleton scope.Tavian Barnes2014-09-154-0/+227
| * lazy: Implement Lazy<T>, very much like Dagger's.Tavian Barnes2014-09-148-0/+758
| * core: Add PotentialAnnotation.from(Key<?>) method.Tavian Barnes2014-09-142-5/+83
| * Bump the version to 1.2-SNAPSHOT.Tavian Barnes2014-09-146-11/+11